Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 8 insertions, 0 deletions

diff --git a/linden/indra/newview/lltoolgrab.h b/linden/indra/newview/lltoolgrab.h
index 5db7fcf..03cbcaf 100644
--- a/linden/indra/newview/lltoolgrab.h
+++ b/linden/indra/newview/lltoolgrab.h
@@ -118,6 +118,14 @@ private:
         BOOL                    mOutsideSlop;   // has mouse moved outside center 5 pixels?
         BOOL                    mDeselectedThisClick;
 
+        S32             mLastFace;
+        LLVector2       mLastUVCoords;
+        LLVector2       mLastSTCoords;
+        LLVector3       mLastIntersection;
+        LLVector3       mLastNormal;
+        LLVector3       mLastBinormal;
+        LLVector3       mLastGrabPos;
+
 
         BOOL                    mSpinGrabbing;
         LLQuaternion    mSpinRotation;