aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvlcomposition.cpp9
1 files changed, 7 insertions, 2 deletions
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
79 // Initialize the texture matrix to defaults. 79 // Initialize the texture matrix to defaults.
80 for (S32 i = 0; i < CORNER_COUNT; ++i) 80 for (S32 i = 0; i < CORNER_COUNT; ++i)
81 { 81 {
82 mStartHeight[i] = gSavedSettings.getF32("TerrainColorStartHeight"); 82 //Zwag: I'm making these static values because they are a LARGE performance problem
83 mHeightRange[i] = gSavedSettings.getF32("TerrainColorHeightRange"); 83 // right now, and I've never heard of anyone changing them, they are not referenced
84 // elsewhere, and have not changed in defaults since the original source code release.
85 // We can move these back to signal connected statics if they really become important
86 // variables in the future.
87 mStartHeight[i] = 20.f;//gSavedSettings.getF32("TerrainColorStartHeight");
88 mHeightRange[i] = 60.f;//gSavedSettings.getF32("TerrainColorHeightRange");
84 } 89 }
85 mTexScaleX = 16.f; 90 mTexScaleX = 16.f;
86 mTexScaleY = 16.f; 91 mTexScaleY = 16.f;