From bc8fe00b991522ea310efd2eac3af24a11a05964 Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Thu, 3 Sep 2015 19:21:49 +0300
Subject: MAINT-5268 (Rotating an object that's used as grid reference goes
 crazy)

---
 indra/newview/llmaniprotate.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llmaniprotate.cpp')

diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index f172aa0955..aa520a728c 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;
@@ -1294,7 +1294,7 @@ LLVector3 LLManipRotate::getConstraintAxis()
 	else
 	{
 		S32 axis_dir = mManipPart - LL_ROT_X;
-		if ((axis_dir >= 0) && (axis_dir < 3))
+		if ((axis_dir >= LL_NO_PART) && (axis_dir < LL_Z_ARROW))
 		{
 			axis.mV[axis_dir] = 1.f;
 		}
-- 
cgit v1.2.3