summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-01 11:47:20 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-01 11:47:20 -0700
commit19be852fd63f9ae9eef1ff9aa864bd25d0d200bc (patch)
tree21c8c123d6be6c42f022bd954ab54e1bfbc2a0af /indra/newview/app_settings
parent86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (diff)
parent9e211a3e209e6ef2ac55df04c07f4f3d36987580 (diff)
Automated merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/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 9a02777697..6bb780e254 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4654,7 +4654,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
<key>MediaShowOutsideParcel</key>
<map>