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/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 @@ settings_rlv.xml + SGTextFadeDistance + + Comment + Distance after which HUD text starts to fade + Persist + 1 + Type + F32 + Value + 8.0 + + CCSAllowNameplateOverride Comment 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 ; } 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;