diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-13 16:57:35 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-13 16:57:35 -0700 |
| commit | 379aff3520d368d1119e00f46684670030472832 (patch) | |
| tree | c01d59617248723b29309fd3f16a01c4f45e7a43 /indra/newview/llfloatertools.cpp | |
| parent | 0e8ef689babf51294c0ebae3f77a849425b5fb27 (diff) | |
PATH-713: Disabling all editable object fields on the build tools floater when a static pathfinding object is in not in the current region.
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 |