diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-21 18:00:21 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-21 18:00:21 -0700 |
| commit | 22681ddb90b9fcb5eccb4467bb13704075de67d9 (patch) | |
| tree | bb5ea48aeaf386c313518ba9dabff1fa32d2c03a /indra/newview/llselectmgr.cpp | |
| parent | b7aa6803a1f34de0cce9a88f9ecd9c7827c4bb52 (diff) | |
PATH-199: Disabling more functionality of the build tool floater when permanancy is enforced.
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index ae61ead935..9b56a5be35 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -638,7 +638,7 @@ bool LLSelectMgr::enableLinkObjects() { virtual bool apply(LLViewerObject* object) { - return object->permModify(); + return object->permModify() && !object->isPermanentEnforced(); } } func; const bool firstonly = true; @@ -654,7 +654,7 @@ bool LLSelectMgr::enableUnlinkObjects() bool new_value = LLSelectMgr::getInstance()->selectGetAllRootsValid() && first_editable_object && - !first_editable_object->isAttachment(); + !first_editable_object->isAttachment() && !first_editable_object->isPermanentEnforced(); return new_value; } |