summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-06-10 00:45:48 -0500
committerDave Parks <davep@lindenlab.com>2010-06-10 00:45:48 -0500
commitf9b13d8f8510b1f7f02fcf92685471461b79858e (patch)
tree72e3469605fb33aedc211649778c22ada2719d5c /indra/newview/app_settings/settings.xml
parentc2da9f5d2cc86af0af34199c53e872fbff22637b (diff)
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 79b58bcd7c..df9393c316 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4908,7 +4908,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>1</real>
+ <real>0</real>
</map>
<key>MigrateCacheDirectory</key>
<map>
@@ -6818,7 +6818,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.0</real>
+ <real>-0.001</real>
</map>
<key>RenderSpotShadowOffset</key>
<map>