diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2012-06-15 00:28:12 +0000 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2012-06-15 00:28:12 +0000 |
| commit | e76fe073df81d4fd2b25d09f7c0ccd0566c2e966 (patch) | |
| tree | b9270197dc7b0c6bc06f0ea44c991d5cbf9be865 /indra/newview/llfloatertools.cpp | |
| parent | 8b2ad982d72ade6db7ae45758171fa7b5e30a42a (diff) | |
| parent | f6153ab73508ad972827950e0276dfd2a8e79bf1 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index c8599df161..105636364c 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1198,7 +1198,10 @@ void LLFloaterTools::getMediaState() return; } - bool editable = (first_object->permModify() || selectedMediaEditable()); + BOOL is_nonpermanent = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() + && LLSelectMgr::getInstance()->selectGetRootsNonPermanent()) + || LLSelectMgr::getInstance()->selectGetNonPermanent(); + bool editable = is_nonpermanent && (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 |