Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 3 insertions, 0 deletions

diff --git a/linden/indra/newview/llmanipscale.h b/linden/indra/newview/llmanipscale.h
index 1de0459..c6545fd 100644
--- a/linden/indra/newview/llmanipscale.h
+++ b/linden/indra/newview/llmanipscale.h
@@ -89,6 +89,8 @@ public:
         static void             setShowAxes( BOOL b );
         static BOOL             getShowAxes();
 
+        static F32              getMaxPrimSize();
+
 private:
         void                    renderCorners( const LLBBox& local_bbox );
         void                    renderFaces( const LLBBox& local_bbox );
@@ -166,6 +168,7 @@ private:
         F32                             mScaleSnapValue;
         BOOL                    mInSnapRegime;
         F32*                    mManipulatorScales;
+        F32                             mMaxPrimSize;
 };
 
 #endif  // LL_MANIPSCALE_H