From d00b6e4216bb308ae075d90dfa871c902d765f8d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 21 Sep 2023 21:44:37 +0300
Subject: SL-15039 Prune unused preferences #1

List of removed preferences (usused per statistics):
AdvanceOutfitSnapshot
AnimationDebug
AskedAboutCrashReports
AudioLevelDoppler
AudioLevelRolloff
AudioLevelUnderwaterRolloff
AudioLevelWind
AutoAcceptNewInventory
AutoLoadWebProfiles
AvatarBacklight
AvatarPickerSortOrder
AvatarPosFinalOffset
AvatarBakedTextureUploadTimeout
AvatarBakedLocalTextureUpdateTimeout
AnimatedObjectsIgnoreLimits
AnimatedObjectsGlobalScale
AvatarBoundingBoxComplexity
StartUpChannelUUID
NearByChatChannelUUID
NotificationChannelUUID
AlertChannelUUID
AssetStorageLogFrequency
AvatarInspectorTooltipDelay
AllowBottomTrayButtonReordering
AvatarRotateThresholdSlow
AvatarRotateThresholdFast
---
 indra/newview/llviewerobject.cpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'indra/newview/llviewerobject.cpp')

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f47f0b4572..55a6d19103 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3867,20 +3867,13 @@ F32 LLViewerObject::recursiveGetEstTrianglesMax() const
 S32 LLViewerObject::getAnimatedObjectMaxTris() const
 {
     S32 max_tris = 0;
-    if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits")) 
+    if (gAgent.getRegion())
     {
-        max_tris = S32_MAX;
-    }
-    else
-    {
-        if (gAgent.getRegion())
+        LLSD features;
+        gAgent.getRegion()->getSimulatorFeatures(features);
+        if (features.has("AnimatedObjects"))
         {
-            LLSD features;
-            gAgent.getRegion()->getSimulatorFeatures(features);
-            if (features.has("AnimatedObjects"))
-            {
-                max_tris = features["AnimatedObjects"]["AnimatedObjectMaxTris"].asInteger();
-            }
+            max_tris = features["AnimatedObjects"]["AnimatedObjectMaxTris"].asInteger();
         }
     }
     return max_tris;
-- 
cgit v1.2.3


From 5713d1a3fdad397c2f9071bdc39db976950b97b1 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 27 Sep 2023 11:53:23 +0200
Subject: SL-20345 Avoid of ASSERT (\!mRootVolp) in
 LLControlAvatar::~LLControlAvatar()

---
 indra/newview/llviewerobject.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/llviewerobject.cpp')

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 55a6d19103..8607c832b5 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3178,7 +3178,6 @@ void LLViewerObject::unlinkControlAvatar()
         if (mControlAvatar)
         {
             mControlAvatar->markForDeath();
-			mControlAvatar->mRootVolp = NULL;
             mControlAvatar = NULL;
         }
     }
-- 
cgit v1.2.3