Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/siana/SingularityViewer

Browse Source
This commit is contained in:
TighMacFanatic
2011-11-07 19:31:53 -05:00
parent 0e3b735a60 8421661a89
commit e9e05bec90
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llversionviewer.h
View File

@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 6; const S32 LL_VERSION_MINOR = 6;
const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 2; const S32 LL_VERSION_BUILD = 3;
const char * const LL_CHANNEL = "Singularity"; const char * const LL_CHANNEL = "Singularity";

12
indra/newview/app_settings/settings.xml
View File

@@ -9,6 +9,18 @@
<string>settings_rlv.xml</string> <string>settings_rlv.xml</string>
</array> </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> <key>CCSAllowNameplateOverride</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

2
indra/newview/llappviewer.cpp
View File

@@ -3127,7 +3127,7 @@ void dumpVFSCaches()
U32 LLAppViewer::getTextureCacheVersion() U32 LLAppViewer::getTextureCacheVersion()
{ {
//viewer texture cache version, change if the texture cache format changes. //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 ; return TEXTURE_CACHE_VERSION ;
} }

4
indra/newview/llhudtext.cpp
View File

@@ -108,8 +108,8 @@ LLHUDText::LLHUDText(const U8 type) :
{ {
mColor = LLColor4(1.f, 1.f, 1.f, 1.f); mColor = LLColor4(1.f, 1.f, 1.f, 1.f);
mDoFade = TRUE; mDoFade = TRUE;
mFadeDistance = 8.f; mFadeDistance = gSavedSettings.getF32("SGTextFadeDistance");
mFadeRange = 4.f; mFadeRange = mFadeDistance/2.f;
mZCompare = TRUE; mZCompare = TRUE;
mDropShadow = TRUE; mDropShadow = TRUE;
mOffscreen = FALSE; mOffscreen = FALSE;