diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-03 13:59:04 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-03 13:59:04 -0700 |
| commit | 5d0d76572e2d5ce672b501a17bbe60ffabcf256e (patch) | |
| tree | 3f0edb402395ee746b0e7c18149211e01b3e487c /indra | |
| parent | 36a0a58487063152d8aacdeb22060025fe0021c7 (diff) | |
PATH-450: Correcting boolean logic that was resulting in the scale manipulator malfunctioning for non-permanent objects.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llmanipscale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp index bc6a94d61f..00a0bf8894 100644 --- a/indra/newview/llmanipscale.cpp +++ b/indra/newview/llmanipscale.cpp @@ -828,7 +828,7 @@ void LLManipScale::drag( S32 x, S32 y ) LLViewerObject*cur = selectNode->getObject(); LLViewerObject *root_object = (cur == NULL) ? NULL : cur->getRootEdit(); if( cur->permModify() && cur->permMove() && !cur->isPermanentEnforced() && - ((root_object == NULL) || root_object->isPermanentEnforced()) && + ((root_object == NULL) || !root_object->isPermanentEnforced()) && !cur->isAvatar()) { selectNode->mLastScale = cur->getScale(); @@ -1003,7 +1003,7 @@ void LLManipScale::dragCorner( S32 x, S32 y ) LLViewerObject* cur = selectNode->getObject(); LLViewerObject *root_object = (cur == NULL) ? NULL : cur->getRootEdit(); if( cur->permModify() && cur->permMove() && !cur->isPermanentEnforced() && - ((root_object == NULL) && !root_object->isPermanentEnforced()) && + ((root_object == NULL) || !root_object->isPermanentEnforced()) && !cur->isAvatar() && cur->isRootEdit() ) { const LLVector3& scale = selectNode->mSavedScale; |