livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverting check-in to release with no QA... svn merge svn+ssh://svn/svn/linden/release -r 61312:61311

master
Don Kjer 2007-05-03 16:01:43 +00:00
parent 1f9058065c
commit 5d0cbafc85
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llpanelcontents.cpp
View File

@ -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