Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index a26445b4bc..26aabb9d4c 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -56,7 +56,7 @@ void LLReflectionMap::update(U32 resolution, U32 face)
     llassert(mCubeArray.notNull());
     llassert(mCubeIndex != -1);
     //llassert(LLPipeline::sRenderDeferred);
-    
+
     // make sure we don't walk off the edge of the render target
     while (resolution > gPipeline.mRT->deferredScreen.getWidth() ||
         resolution > gPipeline.mRT->deferredScreen.getHeight())
@@ -140,7 +140,7 @@ void LLReflectionMap::autoAdjustOrigin()
             LLVector3 origin(fp);
             F32 height = LLWorld::instance().resolveLandHeightAgent(origin) + 2.f;
             fp[2] = llmax(fp[2], height);
-            
+
             // make sure radius encompasses all objects
             LLSimdScalar r2 = 0.0;
             for (int i = 0; i < 8; ++i)
@@ -160,7 +160,7 @@ void LLReflectionMap::autoAdjustOrigin()
 
             // make sure near clip doesn't poke through ground
             fp[2] = llmax(fp[2], height+mRadius*0.5f);
-            
+
         }
     }
     else if (mViewerObject)
@@ -232,7 +232,7 @@ F32 LLReflectionMap::getNearClip()
 bool LLReflectionMap::getIsDynamic()
 {
     if (gSavedSettings.getS32("RenderReflectionProbeDetail") > (S32) LLReflectionMapManager::DetailLevel::STATIC_ONLY &&
-        mViewerObject && 
+        mViewerObject &&
         mViewerObject->getVolume())
     {
         return ((LLVOVolume*)mViewerObject)->getReflectionProbeIsDynamic();
@@ -242,7 +242,7 @@ bool LLReflectionMap::getIsDynamic()
 }
 
 bool LLReflectionMap::getBox(LLMatrix4& box)
-{ 
+{
     if (mViewerObject)
     {
         LLVolume* volume = mViewerObject->getVolume();
@@ -265,7 +265,7 @@ bool LLReflectionMap::getBox(LLMatrix4& box)
                     // construct object to camera space (with scale)
                     mv = mv * rm * scale;
 
-                    // inverse is camera space to object unit cube 
+                    // inverse is camera space to object unit cube
                     mv = mv.inverse();
 
                     box = LLMatrix4(mv.m);
@@ -332,7 +332,7 @@ void LLReflectionMap::doOcclusion(const LLVector4a& eye)
         mOccluded = false;
         return;
     }
-    
+
     if (mOcclusionQuery == 0)
     { // no query was previously issued, allocate one and issue
         LL_PROFILE_ZONE_NAMED_CATEGORY_PIPELINE("rmdo - glGenQueries");