diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index 02d1fa465..ec5a46377 100644 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -41,6 +41,7 @@ #include "llviewerwindow.h" #include "lluictrlfactory.h" #include "llpermissions.h" +#include "hippogridmanager.h" namespace { @@ -82,6 +83,9 @@ BOOL LLFloaterPerms::postBuild() bool export_support = LFSimFeatureHandler::instance().simSupportsExport(); const U32 next_owner_perms = getNextOwnerPerms(); 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) childSetEnabled("next_owner_transfer", false); else if (export_support) diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp index e9227dde5..cbd42ac0b 100644 --- a/indra/newview/llfloaterproperties.cpp +++ b/indra/newview/llfloaterproperties.cpp @@ -448,6 +448,8 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item) bool supports_export = LFSimFeatureHandler::instance().simSupportsExport(); childSetEnabled("CheckOwnerExport",false); childSetValue("CheckOwnerExport", supports_export && owner_mask & PERM_EXPORT); + if (!gHippoGridManager->getCurrentGrid()->isSecondLife()) + childSetVisible("CheckOwnerExport", false); /////////////////////// // DEBUG PERMISSIONS // diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index d41fa36d0..019bf507f 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -772,6 +772,8 @@ void LLPanelPermissions::refresh() else { childSetEnabled("checkbox allow export", false); + if (!gHippoGridManager->getCurrentGrid()->isSecondLife()) + childSetVisible("checkbox allow export", false); } if (has_change_sale_ability && (owner_mask_on & PERM_TRANSFER))