diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-21 18:03:23 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-21 18:03:23 -0700 |
| commit | f143da27bf09b0e7a9b73de80609b2326a7e672e (patch) | |
| tree | 739255a2cfe1c1468cdb468afa83bdbbd4ae3c14 /indra/newview/llfloatertools.cpp | |
| parent | aea6b0c70ccb1a330c1ee2a0f66c3fa72d2700ca (diff) | |
PATH-760: Ensuring that the pathfinding attribute field works correctly with multiple objects selected.
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 3eb0b484dd..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() + BOOL is_nonpermanent_enforced = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() && LLSelectMgr::getInstance()->selectGetRootsNonPermanentEnforced()) || LLSelectMgr::getInstance()->selectGetNonPermanentEnforced(); - bool editable = is_nonpermanent && (first_object->permModify() || selectedMediaEditable()); + 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 |