summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelcontents.cpp
diff options
context:
space:
mode:
authorArthur Abraham <a2@lindenlab.com>2007-05-03 02:53:18 +0000
committerArthur Abraham <a2@lindenlab.com>2007-05-03 02:53:18 +0000
commit1f9058065c96d027239800912e056b54f84c73dc (patch)
treecf1a6b131280f4ceda188959889b14d732f7adf4 /indra/newview/llpanelcontents.cpp
parent9ea022f493fc5e544933ab7caed8eff96b6b74a2 (diff)
Solves SL-23488
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
-rw-r--r--indra/newview/llpanelcontents.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index 4c76e7491b..f76f8cc61a 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -87,9 +87,13 @@ 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());
+ || (objectp->permModify()
+ && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488
BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
// Edit script button - ok if object is editable and there's an