diff options
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | shining-fixes_rev18977.patch | 41 |
3 files changed, 2 insertions, 43 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index f98a5398c3..99c5412ae5 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 8; -const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_PATCH = 4; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 648ef9ebbc..34890b23eb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12584,7 +12584,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>WaterGLFogDensityScale</key> <map> diff --git a/shining-fixes_rev18977.patch b/shining-fixes_rev18977.patch deleted file mode 100644 index b711da870a..0000000000 --- a/shining-fixes_rev18977.patch +++ /dev/null @@ -1,41 +0,0 @@ -# HG changeset patch -# User Dave Parks <davep@lindenlab.com> -# Date 1308673064 18000 -# Node ID 95c5639a3f80920e8dc54703d894517dd7694edf -# Parent 6af10678de4736222b2c3f7e010e984fb5b327de -SH-208 Disable VBO on all intel graphics chips (stability improvement). - -diff -r 6af10678de47 -r 95c5639a3f80 indra/newview/featuretable.txt ---- a/indra/newview/featuretable.txt Mon Jun 20 16:42:31 2011 -0700 -+++ b/indra/newview/featuretable.txt Tue Jun 21 11:17:44 2011 -0500 -@@ -1,4 +1,4 @@ --version 29 -+version 30 - - // NOTE: This is mostly identical to featuretable_mac.txt with a few differences - // Should be combined into one table -@@ -297,6 +297,7 @@ - - list Intel - RenderAnisotropic 1 0 -+RenderVBOEnable 1 0 - - list GeForce2 - RenderAnisotropic 1 0 -diff -r 6af10678de47 -r 95c5639a3f80 indra/newview/featuretable_xp.txt ---- a/indra/newview/featuretable_xp.txt Mon Jun 20 16:42:31 2011 -0700 -+++ b/indra/newview/featuretable_xp.txt Tue Jun 21 11:17:44 2011 -0500 -@@ -1,4 +1,4 @@ --version 29 -+version 30 - - // NOTE: This is mostly identical to featuretable_mac.txt with a few differences - // Should be combined into one table -@@ -295,6 +295,7 @@ - - list Intel - RenderAnisotropic 1 0 -+RenderVBOEnable 1 0 - - list GeForce2 - RenderAnisotropic 1 0 |