From c1fe3a3ed6aca0e0439a4f0d1116a31e9999a495 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 18 Sep 2014 11:46:36 +0300
Subject: MAINT-4433 FIXED Don't start changing scale on first click.

---
 indra/newview/llmanipscale.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llmanipscale.h')

diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h
index 7cc3c99810..e93b3d4f83 100755
--- a/indra/newview/llmanipscale.h
+++ b/indra/newview/llmanipscale.h
@@ -172,6 +172,9 @@ private:
 	ESnapRegimes	mSnapRegime; //<! Which, if any, snap regime the cursor is currently residing in.
 	F32				mManipulatorScales[NUM_MANIPULATORS];
 	F32				mBoxHandleSize[NUM_MANIPULATORS];		// The size of the handles at the corners of the bounding box
+	S32				mFirstClickX;
+	S32				mFirstClickY;
+	bool			mIsFirstClick;
 };
 
 #endif  // LL_MANIPSCALE_H
-- 
cgit v1.2.3


From e298325bed05f0f37fd134b72c68cce186475f23 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 23 Sep 2014 19:12:35 -0700
Subject: MAINT-4481 FIX [viewer-lion] Linux build fails due array-bounds issue
 in llmanipscale.cpp This was an out of bounds array access on a code path not
 normally accessed To test, set debug setting ScaleShowAxes to true, go into
 build mode, and hold down Ctrl+Shift to scale an object There should be
 colored bars along the scale axes, limited to the bounds of the object's
 extents

---
 indra/newview/llmanipscale.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/llmanipscale.h')

diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h
index e93b3d4f83..11ade9b7d0 100755
--- a/indra/newview/llmanipscale.h
+++ b/indra/newview/llmanipscale.h
@@ -96,7 +96,6 @@ public:
 private:
 	void			renderCorners( const LLBBox& local_bbox );
 	void			renderFaces( const LLBBox& local_bbox );
-	void			renderEdges( const LLBBox& local_bbox );
 	void			renderBoxHandle( F32 x, F32 y, F32 z );
 	void			renderAxisHandle( U32 part, const LLVector3& start, const LLVector3& end );
 	void			renderGuidelinesPart( const LLBBox& local_bbox );
-- 
cgit v1.2.3