diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-04-02 18:12:58 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-04-02 18:12:58 -0500 |
| commit | 0cce43aefefa2546b83f373ed81f8dbc7a6241d2 (patch) | |
| tree | 7c228bd77d7787b5865de61f9dbd754b9dcd83a7 /indra/newview/llviewerwindow.cpp | |
| parent | 6e184e33018a5395bfbb2c92812229d115944ab5 (diff) | |
| parent | 9ccc2a0fced1a5b1e6bdef34eef07133f7754c72 (diff) | |
merge
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; |