diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
| commit | da0b5fe998434a935027b5e7cca2b70b895f0673 (patch) | |
| tree | 538531439ee880365c681dd4a0652b312c3734f9 /indra/newview/llpanelcontents.cpp | |
| parent | d7400ae60c0453e111357abfb09d8308adf8b721 (diff) | |
| parent | eb341068de59c86101aa4fd4031b6cdd7e4bbdc2 (diff) | |
merge up to latest viewer-development-havokai
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
| -rw-r--r-- | indra/newview/llpanelcontents.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index a64b4ec94d..77e1487f38 100644 --- a/indra/newview/llpanelcontents.cpp +++ b/indra/newview/llpanelcontents.cpp @@ -116,7 +116,7 @@ void LLPanelContents::getState(LLViewerObject *objectp ) // BUG? Check for all objects being editable? bool editable = gAgent.isGodlike() - || (objectp->permModify() + || (objectp->permModify() && !objectp->isPermanentEnforced() && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488 BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ); @@ -127,6 +127,8 @@ void LLPanelContents::getState(LLViewerObject *objectp ) ((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1) || (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1))); + getChildView("button permissions")->setEnabled(!objectp->isPermanentEnforced()); + mPanelInventoryObject->setEnabled(!objectp->isPermanentEnforced()); } void LLPanelContents::refresh() |