From a9c7cc486f4de721d42279263af33b272e15c830 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Wed, 14 Aug 2013 14:55:12 -0600
Subject: remove some code which has nagetive impact on memory footprint.
---
indra/newview/llviewerregion.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index cfe765a1cb..5cdf43486e 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1205,12 +1205,7 @@ BOOL LLViewerRegion::idleUpdate(F32 max_update_time)
max_update_time -= update_timer.getElapsedTimeF32();
- if(sNewObjectCreationThrottle < 0 && (LLStartUp::getStartupState() < STATE_STARTED || gTeleportDisplay))
- {
- //apply octree cullings here to pick up visible objects because rendering pipeline stops view culling at this moment
- mImpl->mVOCachePartition->cull(*LLViewerCamera::getInstance(), false);
- }
- else if(max_update_time < 0.f)
+ if(max_update_time < 0.f)
{
return did_update;
}
--
cgit v1.2.3
From 23214506d280b485cc74372a9dbb8d6b8c3937c5 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Wed, 14 Aug 2013 14:56:35 -0600
Subject: enable far clip plane culling on object cache view culling
---
indra/newview/llvocache.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 7dfa131ebf..67a0b58241 100755
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -531,7 +531,7 @@ public:
virtual S32 frustumCheck(const LLviewerOctreeGroup* group)
{
-#if 0
+#if 1
S32 res = AABBInRegionFrustumGroupBounds(group);
#else
S32 res = AABBInRegionFrustumNoFarClipGroupBounds(group);
@@ -545,7 +545,7 @@ public:
virtual S32 frustumCheckObjects(const LLviewerOctreeGroup* group)
{
-#if 0
+#if 1
S32 res = AABBInRegionFrustumObjectBounds(group);
#else
S32 res = AABBInRegionFrustumNoFarClipObjectBounds(group);
--
cgit v1.2.3