diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-14 14:57:54 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-14 14:57:54 -0600 |
| commit | 52086d4485e004999d097cb66fb5cf63e34203d2 (patch) | |
| tree | 0e1b648ac9b2046247b0e4cdb0d283646a7b9476 | |
| parent | 9faaa28f4445425e8c5b7b002faffbe0365b905d (diff) | |
| parent | 23214506d280b485cc74372a9dbb8d6b8c3937c5 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 7 | ||||
| -rwxr-xr-x | indra/newview/llvocache.cpp | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 5221220440..24c56df8db 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; } diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index 2576a69f26..838ac353d1 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); |