summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-02 11:27:52 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-02 11:27:52 +0100
commit63f2ddf377fa0fc6a666cdc1001289335d86258b (patch)
treeace7455bb907429aa992a593b4b0dc3704be8914 /indra/newview/app_settings
parentae115d1a89bc425aee478bd31a66827a6f49fd8a (diff)
parent39e6447d98a36eb196f9ed6a3b06f0390f1ed084 (diff)
merge for VWR-1852 VWR-8726 VWR-4232 VWR-22752
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 46ae879aec..6285df31c0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2787,6 +2787,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>EffectScriptChatParticles</key>
+ <map>
+ <key>Comment</key>
+ <string>1 = normal behavior, 0 = disable display of swirling lights when scripts communicate</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>EnableRippleWater</key>
<map>
<key>Comment</key>