diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-30 15:42:43 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-30 15:42:43 -0700 |
| commit | c1a5d6a36b925728d98c37522ed7ae53e3a87155 (patch) | |
| tree | f6bb8cff46ade72e57e0a03a5381234db0befc9c /indra/newview/llviewerwindow.cpp | |
| parent | fcda925072c51de749e6b35b3863f29d8be3eaa6 (diff) | |
PATH-450: Disabling the movement and shape manipulation widgets when editing an item in a linked set.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 49e07a1fe3..3b41cdcdff 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3529,8 +3529,11 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls, { LLSelectNode* nodep = *iter; LLViewerObject* object = nodep->getObject(); + LLViewerObject *root_object = (object == NULL) ? NULL : object->getRootEdit(); BOOL this_object_movable = FALSE; - if (object->permMove() && !object->isPermanentEnforced() && (object->permModify() || selecting_linked_set)) + if (object->permMove() && !object->isPermanentEnforced() && + ((root_object == NULL) || !root_object->isPermanentEnforced()) && + (object->permModify() || selecting_linked_set)) { moveable_object_selected = TRUE; this_object_movable = TRUE; |