Merge remote-tracking branch 'origin/next' into WL-refactor

1 files changed, 3 insertions, 2 deletions

diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 6b7bc1b..9799de7 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -541,7 +541,7 @@ void LLPanelPermissions::refresh()
         // TODO: Creator permissions
 
         BOOL valid_base_perms           = FALSE;
-        BOOL valid_owner_perms          = FALSE;
+        //BOOL valid_owner_perms                = FALSE;
         BOOL valid_group_perms          = FALSE;
         BOOL valid_everyone_perms       = FALSE;
         BOOL valid_next_perms           = FALSE;
@@ -561,7 +561,8 @@ void LLPanelPermissions::refresh()
                                                                           &base_mask_on,
                                                                           &base_mask_off);
 
-        valid_owner_perms = LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
+        // TODO - seems odd, but this is not actually used, except to set owner_mask_*.
+        /*valid_owner_perms =*/ LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
                                                                           &owner_mask_on,
                                                                           &owner_mask_off);