From a2fcf4edac6d2c8599f0fb6433eceaefbdec74f6 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Sat, 14 Jun 2014 23:18:48 -0400 Subject: [PATCH] Touchup to export perm enablement in default permissions (not convinced this feature is working, though) --- indra/newview/llfloaterperms.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index c5fcb02e0..ba79988fc 100644 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -123,7 +123,7 @@ namespace if (!value) // If any of these are unchecked, export can no longer be checked. view->getChildView(type+"everyone_export")->setEnabled(false); 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) { 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)) {