From 9bfd0f75c3e18a4743e4b5f7e0d5d15d99aca656 Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Tue, 8 Sep 2015 20:08:07 +0300
Subject: [PATCH] MAINT-5268 (Rotating an object that's used as grid reference
goes crazy) - changeset 2
---
indra/newview/llmaniprotate.cpp | 2 +-
indra/newview/llselectmgr.cpp | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index aa520a728ca..e917b0ae52d 100755
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -591,7 +591,7 @@ void LLManipRotate::drag( S32 x, S32 y )
continue;
}
}
-
+
LLQuaternion new_rot = selectNode->mSavedRotation * mRotation;
std::vector<LLVector3>& child_positions = object->mUnselectedChildrenPositions ;
std::vector<LLQuaternion> child_rotations;
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 49a7ab3280f..577c336ac7e 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1236,10 +1236,12 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull())
{
LLSelectNode *node = mSelectedObjects->findNode(first_grid_object);
- if (node) {
+ if (node)
+ {
mGridRotation = node->mSavedRotation;
}
- else {
+ else
+ {
mGridRotation = first_grid_object->getRenderRotation();
}
--
GitLab