2 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6185340..f16be88 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -5,6 +5,11 @@
                 modified:   linden/indra/newview/llselectmgr.cpp
                 
 
+     * Small performance change from Emerald viewer in LLVLComposition.
+         
+                modified:   linden/indra/newview/llvlcomposition.cpp
+                
+         
 2009-09-13  McCabe Maxsted  <hakushakukun@gmail.com>
 
      * Added prev/next buttons for windlight presets, cleaned up some stuff.
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index bc7a2f4..cd8d1c0 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -79,8 +79,13 @@ LLVLComposition::LLVLComposition(LLSurface *surfacep, const U32 width, const F32
         // Initialize the texture matrix to defaults.
         for (S32 i = 0; i < CORNER_COUNT; ++i)
         {
-                mStartHeight[i] = gSavedSettings.getF32("TerrainColorStartHeight");
-                mHeightRange[i] = gSavedSettings.getF32("TerrainColorHeightRange");
+                //Zwag: I'm making these static values because they are a LARGE performance problem
+                // right now, and I've never heard of anyone changing them, they are not referenced
+                // elsewhere, and have not changed in defaults since the original source code release.
+                // We can move these back to signal connected statics if they really become important
+                // variables in the future.
+                mStartHeight[i] = 20.f;//gSavedSettings.getF32("TerrainColorStartHeight");
+                mHeightRange[i] = 60.f;//gSavedSettings.getF32("TerrainColorHeightRange");
         }
         mTexScaleX = 16.f;
         mTexScaleY = 16.f;