diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-02-14 20:17:55 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-02-14 20:17:55 +0200 |
| commit | 86935443eb6d97bb8b37090417cb2da57c01db82 (patch) | |
| tree | ece5acb2c94f99ce4da919c9574aa4b92023fb9e /indra/newview | |
| parent | bbb516c5ae1b86c7f2ed3f2a92c2c177c4e26fd2 (diff) | |
MAINT-931 Fixed Sitting avatar's rotation is not updated correctly viewer side
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 73d08ec335..d0dea5d044 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1587,9 +1587,14 @@ void LLPanelObject::sendRotation(BOOL btn_down) { rotation = rotation * ~mRootObject->getRotationRegion(); } + + // To include avatars into movements and rotation + // If false, all children are selected anyway - move avatar + // If true, not all children are selected - save positions + bool individual_selection = gSavedSettings.getBOOL("EditLinkedParts"); std::vector<LLVector3>& child_positions = mObject->mUnselectedChildrenPositions ; std::vector<LLQuaternion> child_rotations; - if (mObject->isRootEdit()) + if (mObject->isRootEdit() && individual_selection) { mObject->saveUnselectedChildrenRotation(child_rotations) ; mObject->saveUnselectedChildrenPosition(child_positions) ; @@ -1599,8 +1604,8 @@ void LLPanelObject::sendRotation(BOOL btn_down) LLManip::rebuild(mObject) ; // for individually selected roots, we need to counterrotate all the children - if (mObject->isRootEdit()) - { + if (mObject->isRootEdit() && individual_selection) + { mObject->resetChildrenRotationAndPosition(child_rotations, child_positions) ; } |