summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-10-15 11:31:39 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-10-15 11:31:39 -0700
commit8766f321d83cd264e002bef10ce7a4042c831617 (patch)
tree25e8af149d450a8239bc6035e0a3b207807d92e4 /indra/newview/app_settings/settings.xml
parent508686047d5e98934d5fefbb576e54f108df6fe3 (diff)
parentd4361230cd3d3e2dd39c42bd05cb56402571014c (diff)
automated merge
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 86ca8b121b..005f76eef8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2897,6 +2897,17 @@
<key>Value</key>
<integer>175</integer>
</map>
+ <key>EventURL</key>
+ <map>
+ <key>Comment</key>
+ <string>URL for Event website, displayed in the event floater</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>http://search.secondlife.com/viewer/embed/event/</string>
+ </map>
<key>EveryoneCopy</key>
<map>
<key>Comment</key>