diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
| commit | 0f958faacd37461a26af76d34a6b29744a2cd1ec (patch) | |
| tree | 2233d2143c3529a1ffd3b66ee9db5108abeb77f4 /indra/newview/llfloatertools.cpp | |
| parent | 1b8bbc7b863ccfc25833dcdbbf0dd9e3e96dc0bb (diff) | |
| parent | eff9be530805298339f656f86a52ade9efeba779 (diff) | |
merge up to 3.3.3-release + pathfinding
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 105636364c..99ebb0eb34 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1198,10 +1198,10 @@ void LLFloaterTools::getMediaState() return; } - BOOL is_nonpermanent = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() - && LLSelectMgr::getInstance()->selectGetRootsNonPermanent()) - || LLSelectMgr::getInstance()->selectGetNonPermanent(); - bool editable = is_nonpermanent && (first_object->permModify() || selectedMediaEditable()); + BOOL is_nonpermanent_enforced = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() + && LLSelectMgr::getInstance()->selectGetRootsNonPermanentEnforced()) + || LLSelectMgr::getInstance()->selectGetNonPermanentEnforced(); + bool editable = is_nonpermanent_enforced && (first_object->permModify() || selectedMediaEditable()); // Check modify permissions and whether any selected objects are in // the process of being fetched. If they are, then we're not editable |