Skip to content
Snippets Groups Projects
Commit 5d0cbafc authored by Don Kjer's avatar Don Kjer
Browse files

Reverting check-in to release with no QA... svn merge...

Reverting check-in to release with no QA... svn merge svn+ssh://svn/svn/linden/release -r 61312:61311
parent 1f905806
No related branches found
No related tags found
No related merge requests found
...@@ -87,13 +87,9 @@ void LLPanelContents::getState(LLViewerObject *objectp ) ...@@ -87,13 +87,9 @@ void LLPanelContents::getState(LLViewerObject *objectp )
return; 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? // BUG? Check for all objects being editable?
BOOL editable = gAgent.isGodlike() BOOL editable = gAgent.isGodlike()
|| (objectp->permModify() || (objectp->permModify() && objectp->permYouOwner());
&& ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488
BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ); BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
// Edit script button - ok if object is editable and there's an // Edit script button - ok if object is editable and there's an
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment