1 files changed, 20 insertions, 6 deletions

diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index b1cdfe3..65f99ef 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -70,6 +70,8 @@ const F32 SNAP_GUIDE_SCREEN_LENGTH = 0.7f;
 const F32 SELECTED_MANIPULATOR_SCALE = 1.2f;
 const F32 MANIPULATOR_SCALE_HALF_LIFE = 0.07f;
 const S32 NUM_MANIPULATORS = 14;
+const F32 DEFAULT_LL_MAX_PRIM_SCALE = 10.f; 
+const F32 DEFAULT_OPENSIM_MAX_PRIM_SCALE = 128.f;
 
 const LLManip::EManipPart MANIPULATOR_IDS[NUM_MANIPULATORS] = 
 {
@@ -174,6 +176,7 @@ LLManipScale::LLManipScale( LLToolComposite* composite )
         mScaledBoxHandleSize( 1.f ),
         mLastMouseX( -1 ),
         mLastMouseY( -1 ),
+        mMaxPrimSize(0.f),
         mSendUpdateOnMouseUp( FALSE ),
         mLastUpdateFlags( 0 ),
         mScaleSnapUnit1(1.f),
@@ -202,6 +205,7 @@ void LLManipScale::render()
         LLGLDepthTest gls_depth(GL_TRUE);
         LLGLEnable gl_blend(GL_BLEND);
         LLGLEnable gls_alpha_test(GL_ALPHA_TEST);
+        mMaxPrimSize = gSavedSettings.getBOOL("LoggedIntoOpenSim") ? DEFAULT_OPENSIM_MAX_PRIM_SCALE : DEFAULT_LL_MAX_PRIM_SCALE;
         
         if( canAffectSelection() )
         {
@@ -953,8 +957,8 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                 mInSnapRegime = FALSE;
         }
 
-        F32 max_scale_factor = DEFAULT_MAX_PRIM_SCALE / MIN_PRIM_SCALE;
-        F32 min_scale_factor = MIN_PRIM_SCALE / DEFAULT_MAX_PRIM_SCALE;
+        F32 max_scale_factor = mMaxPrimSize / MIN_PRIM_SCALE;
+        F32 min_scale_factor = MIN_PRIM_SCALE / mMaxPrimSize;
 
         // find max and min scale factors that will make biggest object hit max absolute scale and smallest object hit min absolute scale
         for (LLObjectSelection::iterator iter = mObjectSelection->begin();
@@ -966,7 +970,7 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                 {
                         const LLVector3& scale = selectNode->mSavedScale;
 
-                        F32 cur_max_scale_factor = llmin( DEFAULT_MAX_PRIM_SCALE / scale.mV[VX], DEFAULT_MAX_PRIM_SCALE / scale.mV[VY], DEFAULT_MAX_PRIM_SCALE / scale.mV[VZ] );
+                        F32 cur_max_scale_factor = llmin( mMaxPrimSize / scale.mV[VX], mMaxPrimSize / scale.mV[VY], mMaxPrimSize / scale.mV[VZ] );
                         max_scale_factor = llmin( max_scale_factor, cur_max_scale_factor );
 
                         F32 cur_min_scale_factor = llmax( MIN_PRIM_SCALE / scale.mV[VX], MIN_PRIM_SCALE / scale.mV[VY], MIN_PRIM_SCALE / scale.mV[VZ] );
@@ -1263,7 +1267,7 @@ void LLManipScale::stretchFace( const LLVector3& drag_start_agent, const LLVecto
 
                         F32 denom = axis * dir_local;
                         F32 desired_delta_size  = is_approx_zero(denom) ? 0.f : (delta_local_mag / denom);  // in meters
-                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_PRIM_SCALE, DEFAULT_MAX_PRIM_SCALE);
+                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_PRIM_SCALE, mMaxPrimSize);
                         // propagate scale constraint back to position offset
                         desired_delta_size              = desired_scale - selectNode->mSavedScale.mV[axis_index]; // propagate constraint back to position
 
@@ -1963,7 +1967,7 @@ F32		LLManipScale::partToMaxScale( S32 part, const LLBBox &bbox ) const
                         max_extent = bbox_extents.mV[i];
                 }
         }
-        max_scale_factor = bbox_extents.magVec() * DEFAULT_MAX_PRIM_SCALE / max_extent;
+        max_scale_factor = bbox_extents.magVec() * mMaxPrimSize / max_extent;
 
         if (getUniform())
         {
@@ -1978,7 +1982,7 @@ F32		LLManipScale::partToMinScale( S32 part, const LLBBox &bbox ) const
 {
         LLVector3 bbox_extents = unitVectorToLocalBBoxExtent( partToUnitVector( part ), bbox );
         bbox_extents.abs();
-        F32 min_extent = DEFAULT_MAX_PRIM_SCALE;
+        F32 min_extent = mMaxPrimSize;
         for (U32 i = VX; i <= VZ; i++)
         {
                 if (bbox_extents.mV[i] > 0.f && bbox_extents.mV[i] < min_extent)
@@ -2053,3 +2057,13 @@ BOOL LLManipScale::canAffectSelection()
         }
         return can_scale;
 }
+
+//static
+F32 LLManipScale::getMaxPrimSize()
+{
+        if (gSavedSettings.getBOOL("LoggedIntoOpenSim"))
+        {
+                return DEFAULT_OPENSIM_MAX_PRIM_SCALE;
+        }
+        return DEFAULT_LL_MAX_PRIM_SCALE;
+}