From 463a8930c8bddd8740478f6400561a48220ee584 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 6 Nov 2013 09:42:06 -0700 Subject: re-organize the code of processing the debug setting "ObjectProjectionAreaCutOff" --- indra/newview/llviewerregion.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'indra/newview/llviewerregion.cpp') diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index fe420fe551..56e0142dd6 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1166,8 +1166,6 @@ void LLViewerRegion::updateVisibleEntries(F32 max_time) void LLViewerRegion::createVisibleObjects(F32 max_time) { - static LLCachedControl projection_area_cutoff(gSavedSettings,"ObjectProjectionAreaCutOFF"); - if(mDead) { return; @@ -1179,10 +1177,8 @@ void LLViewerRegion::createVisibleObjects(F32 max_time) } //object projected area threshold - F32 pixel_meter_ratio = LLViewerCamera::getInstance()->getPixelMeterRatio(); - F32 projection_threshold = pixel_meter_ratio > 0.f ? projection_area_cutoff / pixel_meter_ratio : 0.f; - projection_threshold *= projection_threshold; - + F32 projection_threshold = LLVOCacheEntry::getSquaredObjectScreenAreaThreshold(); + S32 throttle = sNewObjectCreationThrottle; BOOL has_new_obj = FALSE; LLTimer update_timer; -- cgit v1.3