summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2007-05-03 16:01:43 +0000
committerDon Kjer <don@lindenlab.com>2007-05-03 16:01:43 +0000
commit5d0cbafc8550c2c3d6927ec7aa1414031ad7a1b7 (patch)
treefad7f3084aae57b107a8f80bcd2f743ca3ee8123 /indra/newview
parent1f9058065c96d027239800912e056b54f84c73dc (diff)
Reverting check-in to release with no QA... svn merge svn+ssh://svn/svn/linden/release -r 61312:61311
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelcontents.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index f76f8cc61a..4c76e7491b 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -87,13 +87,9 @@ void LLPanelContents::getState(LLViewerObject *objectp )
return;
}
- LLUUID group_id; // used for SL-23488
- gSelectMgr->selectGetGroup(group_id); // sets group_id as a side effect SL-23488
-
// BUG? Check for all objects being editable?
BOOL editable = gAgent.isGodlike()
- || (objectp->permModify()
- && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488
+ || (objectp->permModify() && objectp->permYouOwner());
BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
// Edit script button - ok if object is editable and there's an