From c50cb47f1b78cb9880a34fe8184bd9d0fd7e0e7d Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 17 Oct 2016 22:27:20 +0300
Subject: Backed out changeset: 4df419cb7b2f
---
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/llvovolume.cpp | 13 +------------
2 files changed, 2 insertions(+), 13 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 460c0809a6..28c632b498 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10282,7 +10282,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>6.5</real>
+ <real>7.5</real>
</map>
<key>RenderWater</key>
<map>
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 4aef6480cb..55739915a3 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1257,18 +1257,7 @@ BOOL LLVOVolume::calcLOD()
lod_factor *= LLVOVolume::sRiggedFactorMultiplier;
distance = avatar->mDrawable->mDistanceWRTCamera;
F32 avatar_radius = avatar->getBinRadius();
- F32 object_radius;
- if (mDrawable.notNull() && !mDrawable->isDead())
- {
- const LLVector4a* ext = mDrawable->getSpatialExtents();
- LLVector4a diff;
- diff.setSub(ext[1], ext[0]);
- object_radius = diff.getLength3().getF32();
- }
- else
- {
- object_radius = getVolume() ? getVolume()->mLODScaleBias.scaledVec(getScale()).length() : getScale().length();
- }
+ F32 object_radius = getVolume() ? getVolume()->mLODScaleBias.scaledVec(getScale()).length() : getScale().length();
radius = object_radius * LLVOVolume::sRiggedFactorMultiplier;
radius = llmin(radius, avatar_radius);
}
--
cgit v1.2.3