summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-28 09:18:27 -0400
committerOz Linden <oz@lindenlab.com>2011-06-28 09:18:27 -0400
commit2a789e9c50cde72d20d31127059f0338ea967f89 (patch)
tree1d91941e027b50b3392c48ddaf6d673b6cd19b4d /indra
parent0f140565a5f1dc5508e72abe6873d459734c13f7 (diff)
parent30f3148fbdf1df4b234d0875ed7cfb15913167cc (diff)
merge changes for late beta fixes
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/app_settings/settings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 76fecdf05e..594285b92b 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5576,7 +5576,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <real>1</real>
+ <real>0</real>
</map>
<key>MeshImportUseSLM</key>
<map>