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

Touchup to export perm enablement in default permissions

Browse Source 
(not convinced this feature is working, though)
This commit is contained in:
Inusaito Sayori
2014-06-14 23:18:48 -04:00
parent f56ac5210c
commit a2fcf4edac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterperms.cpp
View File

@@ -123,7 +123,7 @@ namespace
if (!value) // If any of these are unchecked, export can no longer be checked. if (!value) // If any of these are unchecked, export can no longer be checked.
view->getChildView(type+"everyone_export")->setEnabled(false); view->getChildView(type+"everyone_export")->setEnabled(false);
else else
view->getChildView(type+"everyone_export")->setEnabled(LFSimFeatureHandler::instance().simSupportsExport() && LLFloaterPerms::getNextOwnerPerms(type) == PERM_ITEM_UNRESTRICTED); view->getChildView(type+"everyone_export")->setEnabled(LFSimFeatureHandler::instance().simSupportsExport() && (LLFloaterPerms::getNextOwnerPerms(type) & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED);
} }
} }
} }
@@ -152,7 +152,7 @@ const std::string LLFloaterPermsDefault::sCategoryNames[CAT_LAST] =
void LLFloaterPermsDefault::initCheckboxes(bool export_support, const std::string& type) void LLFloaterPermsDefault::initCheckboxes(bool export_support, const std::string& type)
{ {
const U32 next_owner_perms = LLFloaterPerms::getNextOwnerPerms(type); const U32 next_owner_perms = LLFloaterPerms::getNextOwnerPerms(type);
getChildView(type + "everyone_export")->setEnabled(export_support && next_owner_perms == PERM_ITEM_UNRESTRICTED); getChildView(type + "everyone_export")->setEnabled(export_support && (next_owner_perms & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED);
if (!(next_owner_perms & PERM_COPY)) if (!(next_owner_perms & PERM_COPY))
{ {