diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-02-02 18:50:39 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-02-02 18:50:39 +0200 |
| commit | f0e8bc099532d38d56e8ee135b6bc4d0f3691842 (patch) | |
| tree | 44d0b0ba392bc08ed442e9e95f3aaf3b99fd5eba /indra | |
| parent | a849d82520fbb59153c5de0d5e35d7ea008d2f04 (diff) | |
MAINT-1520 FIXED User is able to resize child object and is not able to resize root object when he sits on linked object
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llmanipscale.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp index 85faa70552..3cbe742e3c 100755 --- a/indra/newview/llmanipscale.cpp +++ b/indra/newview/llmanipscale.cpp @@ -2081,7 +2081,7 @@ BOOL LLManipScale::canAffectSelection() { LLViewerObject *root_object = (objectp == NULL) ? NULL : objectp->getRootEdit(); return objectp->permModify() && objectp->permMove() && !objectp->isPermanentEnforced() && - ((root_object == NULL) || !root_object->isPermanentEnforced()) && + (root_object == NULL || (!root_object->isPermanentEnforced() && !root_object->isSeat())) && !objectp->isSeat(); } } func; |