livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

meow-7.2.2
Xiaohong Bao 2013-08-14 14:57:54 -06:00
parent 9faaa28f44 23214506d2
commit 52086d4485
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewerregion.cpp
View File

@ -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;
}

4
indra/newview/llvocache.cpp
View File

@ -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);