Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide the export check boxes when on SL.

Browse Source
This commit is contained in:
Melanie
2013-04-16 12:35:02 +02:00
parent f960a79118
commit ab29c73ff5
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterperms.cpp
View File

@@ -41,6 +41,7 @@
#include "llviewerwindow.h" #include "llviewerwindow.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
#include "llpermissions.h" #include "llpermissions.h"
#include "hippogridmanager.h"
namespace namespace
{ {
@@ -82,6 +83,9 @@ BOOL LLFloaterPerms::postBuild()
bool export_support = LFSimFeatureHandler::instance().simSupportsExport(); bool export_support = LFSimFeatureHandler::instance().simSupportsExport();
const U32 next_owner_perms = getNextOwnerPerms(); const U32 next_owner_perms = getNextOwnerPerms();
childSetEnabled("everyone_export", export_support && (next_owner_perms & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED); childSetEnabled("everyone_export", export_support && (next_owner_perms & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED);
if (!gHippoGridManager->getCurrentGrid()->isSecondLife())
childSetVisible("everyone_export", false);
if (!next_owner_perms & PERM_COPY) if (!next_owner_perms & PERM_COPY)
childSetEnabled("next_owner_transfer", false); childSetEnabled("next_owner_transfer", false);
else if (export_support) else if (export_support)

2
indra/newview/llfloaterproperties.cpp
View File

@@ -448,6 +448,8 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
bool supports_export = LFSimFeatureHandler::instance().simSupportsExport(); bool supports_export = LFSimFeatureHandler::instance().simSupportsExport();
childSetEnabled("CheckOwnerExport",false); childSetEnabled("CheckOwnerExport",false);
childSetValue("CheckOwnerExport", supports_export && owner_mask & PERM_EXPORT); childSetValue("CheckOwnerExport", supports_export && owner_mask & PERM_EXPORT);
if (!gHippoGridManager->getCurrentGrid()->isSecondLife())
childSetVisible("CheckOwnerExport", false);
/////////////////////// ///////////////////////
// DEBUG PERMISSIONS // // DEBUG PERMISSIONS //

2
indra/newview/llpanelpermissions.cpp
View File

@@ -772,6 +772,8 @@ void LLPanelPermissions::refresh()
else else
{ {
childSetEnabled("checkbox allow export", false); childSetEnabled("checkbox allow export", false);
if (!gHippoGridManager->getCurrentGrid()->isSecondLife())
childSetVisible("checkbox allow export", false);
} }
if (has_change_sale_ability && (owner_mask_on & PERM_TRANSFER)) if (has_change_sale_ability && (owner_mask_on & PERM_TRANSFER))