summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-01 09:31:56 -0400
committerOz Linden <oz@lindenlab.com>2011-04-01 09:31:56 -0400
commit9698314736252b248921bb3a3459f2bdf539ffba (patch)
treecff4957f66ae90248466a0dccd6e5886dfb62f55 /indra/newview/app_settings/settings.xml
parented2222be5d33cb4216e6826507ae1d06e9781253 (diff)
parent2c584790d0505ebff13d29e9f068aefcffe54f01 (diff)
merge changes for storm-399
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-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 f0e28d4ae3..14f1b3c4ba 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12102,6 +12102,17 @@
<key>Value</key>
<real>0.40000000596</real>
</map>
+ <key>moapbeacon</key>
+ <map>
+ <key>Comment</key>
+ <string>Beacon / Highlight media on a prim sources</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>particlesbeacon</key>
<map>
<key>Comment</key>