Merge branch 'main' into release/maint-c

# Conflicts:
#	indra/llui/lltexteditor.cpp
#	indra/newview/llcontrolavatar.cpp

1 files changed, 2 insertions, 4 deletions

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 1b3feac4d4..173cf3237d 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -201,8 +201,7 @@ void LLControlAvatar::matchVolumeTransform()
                 mRoot->setWorldRotation(obj_rot * joint_rot);
                 setRotation(mRoot->getRotation());
 
-                F32 global_scale = gSavedSettings.getF32("AnimatedObjectsGlobalScale");
-                setGlobalScale(global_scale * mScaleConstraintFixup);
+                setGlobalScale(mScaleConstraintFixup);
             }
             else
             {
@@ -252,8 +251,7 @@ void LLControlAvatar::matchVolumeTransform()
             }
             mRoot->setPosition(vol_pos + mPositionConstraintFixup);
 
-            F32 global_scale = gSavedSettings.getF32("AnimatedObjectsGlobalScale");
-            setGlobalScale(global_scale * mScaleConstraintFixup);
+            setGlobalScale(mScaleConstraintFixup);
         }
     }
 }