Second Life viewer sources 1.20.2

1 files changed, 8 insertions, 4 deletions

diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index b6fbfbf..7d715be 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -1806,7 +1806,7 @@ S32 LLSpatialPartition::cull(LLCamera &camera, std::vector<LLDrawable *>* result
 
 BOOL earlyFail(LLCamera* camera, LLSpatialGroup* group)
 {
-        const F32 vel = (gCamera->getVelocityStat()->getCurrent()+0.2f);
+        const F32 vel = (LLViewerCamera::getInstance()->getVelocityStat()->getCurrent()+0.2f);
         LLVector3 c = group->mBounds[0];
         LLVector3 r = group->mBounds[1]*SG_OCCLUSION_FUDGE + LLVector3(vel,vel,vel);
     
@@ -2497,7 +2497,7 @@ void LLSpatialPartition::renderDebug()
         if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
         {
                 //sLastMaxTexPriority = lerp(sLastMaxTexPriority, sCurMaxTexPriority, gFrameIntervalSeconds);
-                sLastMaxTexPriority = (F32) gCamera->getScreenPixelArea();
+                sLastMaxTexPriority = (F32) LLViewerCamera::getInstance()->getScreenPixelArea();
                 sCurMaxTexPriority = 0.f;
         }
 
@@ -2510,7 +2510,7 @@ void LLSpatialPartition::renderDebug()
         gPipeline.disableLights();
 
         LLSpatialBridge* bridge = asBridge();
-        LLCamera* camera = gCamera;
+        LLCamera* camera = LLViewerCamera::getInstance();
         
         if (bridge)
         {
@@ -2527,7 +2527,7 @@ void LLSpatialPartition::renderDebug()
 
 BOOL LLSpatialPartition::isVisible(const LLVector3& v)
 {
-        if (!gCamera->sphereInFrustum(v, 4.0f))
+        if (!LLViewerCamera::getInstance()->sphereInFrustum(v, 4.0f))
         {
                 return FALSE;
         }
@@ -2650,6 +2650,10 @@ void LLCullResult::clear()
 
         for (U32 i = 0; i < LLRenderPass::NUM_RENDER_TYPES; i++)
         {
+                for (U32 j = 0; j < mRenderMapSize[i]; j++)
+                {
+                        mRenderMap[i][j] = 0;
+                }
                 mRenderMapSize[i] = 0;
         }
 }