From 41ea42ea9568bf43ef25b5c9c200d37481f349fc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Sep 2009 02:36:36 -0700
Subject: Small performance change from Emerald viewer in LLVLComposition

---
 linden/indra/newview/llvlcomposition.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview')

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;
-- 
cgit v1.1