From 7fea7c589de8a8443d67ae12abc3070bb6fa1b29 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 8 Nov 2011 01:26:51 +0100
Subject: [PATCH 1/2] Make floating text draw distance tunable

---
 indra/newview/app_settings/settings.xml | 12 ++++++++++++
 indra/newview/llhudtext.cpp             |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6d480c2b4..d98f775bd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9,6 +9,18 @@
 		<string>settings_rlv.xml</string>
 	</array>
 
+  <key>SGTextFadeDistance</key>
+  <map>
+    <key>Comment</key>
+    <string>Distance after which HUD text starts to fade</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <integer>8.0</integer>
+  </map>
+
   <key>CCSAllowNameplateOverride</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index 683f46a1f..dfddcd2c6 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -108,8 +108,8 @@ LLHUDText::LLHUDText(const U8 type) :
 {
 	mColor = LLColor4(1.f, 1.f, 1.f, 1.f);
 	mDoFade = TRUE;
-	mFadeDistance = 8.f;
-	mFadeRange = 4.f;
+	mFadeDistance = gSavedSettings.getF32("SGTextFadeDistance");
+	mFadeRange = mFadeDistance/2.f;
 	mZCompare = TRUE;
 	mDropShadow = TRUE;
 	mOffscreen = FALSE;

From 8421661a89d8c560edfdd3289a423845c79b4925 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 8 Nov 2011 01:27:12 +0100
Subject: [PATCH 2/2] Version 1.6.0(3)

---
 indra/llcommon/llversionviewer.h | 2 +-
 indra/newview/llappviewer.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index ca23c9637..f8dd67fb9 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 6;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 2;
+const S32 LL_VERSION_BUILD = 3;
 
 const char * const LL_CHANNEL = "Singularity";
 
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5dd38f79a..3a4bde499 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3127,7 +3127,7 @@ void dumpVFSCaches()
 U32 LLAppViewer::getTextureCacheVersion()
 {
 	//viewer texture cache version, change if the texture cache format changes.
-	static const U32 TEXTURE_CACHE_VERSION = 7;
+	static const U32 TEXTURE_CACHE_VERSION = 8;
 
 	return TEXTURE_CACHE_VERSION ;
 }