SL-860 - clean up of interim code

1 files changed, 5 insertions, 14 deletions

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 9e7a6a410a..a6dad467f0 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -92,7 +92,6 @@ U32 JOINT_COUNT_REQUIRED_FOR_FULLRIG = 1;
 BOOL gAnimateTextures = TRUE;
 //extern BOOL gHideSelectedObjects;
 
-S32 LLVOVolume::sForceLOD = -1;
 F32 LLVOVolume::sLODFactor = 1.f;
 F32	LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop 
 F32 LLVOVolume::sDistanceFactor = 1.0f;
@@ -1246,23 +1245,15 @@ void LLVOVolume::sculpt()
 S32	LLVOVolume::computeLODDetail(F32 distance, F32 radius)
 {
 	S32	cur_detail;
-    // AXON TEMP REMOVE
-    if (LLVOVolume::sForceLOD>=0 && LLVOVolume::sForceLOD<=3)
+    if (LLPipeline::sDynamicLOD)
     {
-        cur_detail = LLVOVolume::sForceLOD;
+        // We've got LOD in the profile, and in the twist.  Use radius.
+        F32 tan_angle = (LLVOVolume::sLODFactor*radius)/distance;
+        cur_detail = LLVolumeLODGroup::getDetailFromTan(ll_round(tan_angle, 0.01f));
     }
     else
     {
-        if (LLPipeline::sDynamicLOD)
-        {
-            // We've got LOD in the profile, and in the twist.  Use radius.
-            F32 tan_angle = (LLVOVolume::sLODFactor*radius)/distance;
-            cur_detail = LLVolumeLODGroup::getDetailFromTan(ll_round(tan_angle, 0.01f));
-        }
-        else
-        {
-            cur_detail = llclamp((S32) (sqrtf(radius)*LLVOVolume::sLODFactor*4.f), 0, 3);		
-        }
+        cur_detail = llclamp((S32) (sqrtf(radius)*LLVOVolume::sLODFactor*4.f), 0, 3);		
     }
 	return cur_detail;
 }