diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-09-21 21:44:37 +0300 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-09-22 19:28:23 +0300 |
| commit | d00b6e4216bb308ae075d90dfa871c902d765f8d (patch) | |
| tree | f43568e9f6079a4c9045535fa25d18e259b0ffc3 /indra/newview/llviewerobject.cpp | |
| parent | ac0299fc7cef28720533947154d34aa1e006e720 (diff) | |
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
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
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; |