diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-04 21:57:06 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-04 21:57:06 +0000 |
| commit | 70aaa3e444cf9cb067addcbdde237762bd62fcf4 (patch) | |
| tree | 4013659d2335c4681b8c93ea795cf8ccb8aa55cd /indra/newview/llpanelcontents.cpp | |
| parent | 08d746156b56d8b72919af8cbca25609c855ef82 (diff) | |
svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
| -rw-r--r-- | indra/newview/llpanelcontents.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index 30adea7d73..724ef8a847 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 |