1 files changed, 46 insertions, 30 deletions

diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index f10aca5..0ca94dc 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -1014,8 +1014,8 @@ U32 LLPipeline::addObject(LLViewerObject *vobj)
         {
                 return 0;
         }
-
-        if (gSavedSettings.getBOOL("RenderDelayCreation"))
+        static BOOL sRenderDelayCreation = gSavedSettings.getBOOL("RenderDelayCreation");
+        if (sRenderDelayCreation)
         {
                 mCreateQ.push_back(vobj);
         }
@@ -1078,7 +1078,9 @@ void LLPipeline::createObject(LLViewerObject* vobj)
 
         markRebuild(drawablep, LLDrawable::REBUILD_ALL, TRUE);
 
-        if (drawablep->getVOVolume() && gSavedSettings.getBOOL("RenderAnimateRes"))
+        static BOOL sRenderAnimateRes = gSavedSettings.getBOOL("RenderAnimateRes");
+
+        if (drawablep->getVOVolume() && sRenderAnimateRes)
         {
                 // fun animated res
                 drawablep->updateXform(TRUE);
@@ -1117,7 +1119,8 @@ void LLPipeline::resetFrameStats()
 //external functions for asynchronous updating
 void LLPipeline::updateMoveDampedAsync(LLDrawable* drawablep)
 {
-        if (gSavedSettings.getBOOL("FreezeTime"))
+        static BOOL* sFreezeTime = rebind_llcontrol<BOOL>("FreezeTime", &gSavedSettings, true);
+        if ((*sFreezeTime))
         {
                 return;
         }
@@ -1147,7 +1150,8 @@ void LLPipeline::updateMoveDampedAsync(LLDrawable* drawablep)
 
 void LLPipeline::updateMoveNormalAsync(LLDrawable* drawablep)
 {
-        if (gSavedSettings.getBOOL("FreezeTime"))
+        static BOOL* sFreezeTime = rebind_llcontrol<BOOL>("FreezeTime", &gSavedSettings, true);
+        if ((*sFreezeTime))
         {
                 return;
         }
@@ -1200,7 +1204,8 @@ void LLPipeline::updateMove()
         LLFastTimer t(LLFastTimer::FTM_UPDATE_MOVE);
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
 
-        if (gSavedSettings.getBOOL("FreezeTime"))
+        static BOOL* sFreezeTime = rebind_llcontrol<BOOL>("FreezeTime", &gSavedSettings, true);
+        if ((*sFreezeTime))
         {
                 return;
         }
@@ -1833,11 +1838,12 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f
 void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 {
         const U32 face_mask = (1 << LLPipeline::RENDER_TYPE_AVATAR) |
-                                                  (1 << LLPipeline::RENDER_TYPE_GROUND) |
-                                                  (1 << LLPipeline::RENDER_TYPE_TERRAIN) |
-                                                  (1 << LLPipeline::RENDER_TYPE_TREE) |
-                                                  (1 << LLPipeline::RENDER_TYPE_SKY) |
-                                                  (1 << LLPipeline::RENDER_TYPE_WATER);
+                              (1 << LLPipeline::RENDER_TYPE_GROUND) |
+                              (1 << LLPipeline::RENDER_TYPE_TERRAIN) |
+                              (1 << LLPipeline::RENDER_TYPE_TREE) |
+                              (1 << LLPipeline::RENDER_TYPE_SKY) |
+                              (1 << LLPipeline::RENDER_TYPE_VOIDWATER) |
+                              (1 << LLPipeline::RENDER_TYPE_WATER);
 
         if (mRenderTypeMask & face_mask)
         {
@@ -2294,8 +2300,10 @@ void LLPipeline::postSort(LLCamera& camera)
                 std::sort(sCull->beginAlphaGroups(), sCull->endAlphaGroups(), LLSpatialGroup::CompareDepthGreater());
         }
         
+        static BOOL* sBeaconsEnabled = rebind_llcontrol<BOOL>("BeaconsEnabled", &gSavedSettings, true);
+
         // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus
-        if (gSavedSettings.getBOOL("BeaconsEnabled") && !sShadowRender)
+        if (*sBeaconsEnabled && !sShadowRender)
         {
                 if (sRenderScriptedTouchBeacons)
                 {
@@ -4436,6 +4444,11 @@ void LLPipeline::toggleRenderType(U32 type)
 {
         U32 bit = (1<<type);
         gPipeline.mRenderTypeMask ^= bit;
+        if (type == RENDER_TYPE_WATER)
+        {
+                bit = (1 << RENDER_TYPE_VOIDWATER);
+                gPipeline.mRenderTypeMask ^= bit;
+        }
 }
 
 //static
@@ -5744,18 +5757,19 @@ void LLPipeline::renderDeferredLighting()
                 LLGLDisable stencil(GL_STENCIL_TEST);
 
                 U32 render_mask = mRenderTypeMask;
-                mRenderTypeMask =       mRenderTypeMask & 
-                                                        ((1 << LLPipeline::RENDER_TYPE_SKY) |
-                                                        (1 << LLPipeline::RENDER_TYPE_CLOUDS) |
-                                                        (1 << LLPipeline::RENDER_TYPE_WL_SKY) |
-                                                        (1 << LLPipeline::RENDER_TYPE_ALPHA) |
-                                                        (1 << LLPipeline::RENDER_TYPE_AVATAR) |
-                                                        (1 << LLPipeline::RENDER_TYPE_WATER) |
-                                                        (1 << LLPipeline::RENDER_TYPE_FULLBRIGHT) |
-                                                        (1 << LLPipeline::RENDER_TYPE_VOLUME) |
-                                                        (1 << LLPipeline::RENDER_TYPE_GLOW) |
-                                                        (1 << LLPipeline::RENDER_TYPE_BUMP));
-                
+                mRenderTypeMask = mRenderTypeMask &
+                                  ((1 << LLPipeline::RENDER_TYPE_SKY) |
+                                   (1 << LLPipeline::RENDER_TYPE_CLOUDS) |
+                                   (1 << LLPipeline::RENDER_TYPE_WL_SKY) |
+                                   (1 << LLPipeline::RENDER_TYPE_ALPHA) |
+                                   (1 << LLPipeline::RENDER_TYPE_AVATAR) |
+                                   (1 << LLPipeline::RENDER_TYPE_VOIDWATER) |
+                                   (1 << LLPipeline::RENDER_TYPE_WATER) |
+                                   (1 << LLPipeline::RENDER_TYPE_FULLBRIGHT) |
+                                   (1 << LLPipeline::RENDER_TYPE_VOLUME) |
+                                   (1 << LLPipeline::RENDER_TYPE_GLOW) |
+                                   (1 << LLPipeline::RENDER_TYPE_BUMP));
+
                 renderGeomPostDeferred(*LLViewerCamera::getInstance());
                 mRenderTypeMask = render_mask;
         }
@@ -5910,10 +5924,11 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 
                         if (LLDrawPoolWater::sNeedsDistortionUpdate)
                         {
-                                mRenderTypeMask &=      ~((1<<LLPipeline::RENDER_TYPE_WATER) |
-                                                                          (1<<LLPipeline::RENDER_TYPE_GROUND) |
-                                                                          (1<<LLPipeline::RENDER_TYPE_SKY) |
-                                                                          (1<<LLPipeline::RENDER_TYPE_CLOUDS)); 
+                                mRenderTypeMask &= ~((1<<LLPipeline::RENDER_TYPE_WATER) |
+                                                     (1<<LLPipeline::RENDER_TYPE_VOIDWATER) |
+                                                     (1<<LLPipeline::RENDER_TYPE_GROUND) |
+                                                     (1<<LLPipeline::RENDER_TYPE_SKY) |
+                                                     (1<<LLPipeline::RENDER_TYPE_CLOUDS));
 
                                 if (gSavedSettings.getBOOL("RenderWaterReflections"))
                                 { //mask out selected geometry based on reflection detail
@@ -5955,8 +5970,9 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                 if (last_update)
                 {
                         camera.setFar(camera_in.getFar());
-                        mRenderTypeMask = type_mask & (~(1<<LLPipeline::RENDER_TYPE_WATER) |
-                                                                                        (1<<LLPipeline::RENDER_TYPE_GROUND));   
+                        mRenderTypeMask = type_mask & ~((1<<LLPipeline::RENDER_TYPE_WATER) |
+                                                        (1<<LLPipeline::RENDER_TYPE_VOIDWATER) |
+                                                        (1<<LLPipeline::RENDER_TYPE_GROUND));
                         stop_glerror();
 
                         LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? FALSE : TRUE;