aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvlcomposition.cpp
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 b79d7d1..a269225 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -80,8 +80,13 @@ LLVLComposition::LLVLComposition(LLSurface *surfacep, const U32 width, const F32
80 // Initialize the texture matrix to defaults. 80 // Initialize the texture matrix to defaults.
81 for (S32 i = 0; i < CORNER_COUNT; ++i) 81 for (S32 i = 0; i < CORNER_COUNT; ++i)
82 { 82 {
83 mStartHeight[i] = gSavedSettings.getF32("TerrainColorStartHeight"); 83 //Zwag: I'm making these static values because they are a LARGE performance problem
84 mHeightRange[i] = gSavedSettings.getF32("TerrainColorHeightRange"); 84 // right now, and I've never heard of anyone changing them, they are not referenced
85 // elsewhere, and have not changed in defaults since the original source code release.
86 // We can move these back to signal connected statics if they really become important
87 // variables in the future.
88 mStartHeight[i] = 20.f;//gSavedSettings.getF32("TerrainColorStartHeight");
89 mHeightRange[i] = 60.f;//gSavedSettings.getF32("TerrainColorHeightRange");
85 } 90 }
86 mTexScaleX = 16.f; 91 mTexScaleX = 16.f;
87 mTexScaleY = 16.f; 92 mTexScaleY = 16.f;