summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-10-14 12:00:27 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-10-14 12:00:27 -0700
commitd4361230cd3d3e2dd39c42bd05cb56402571014c (patch)
tree270680ae4640cb189668e1eadb7a8c12b02ee4b6 /indra/newview/app_settings/settings.xml
parent2303ec6213ea7a591e0084e9fc9350b2afddd3c5 (diff)
parenta486319bd04d01a02f19e61810c84916986de5e5 (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 993c189f3c..79f2a220fd 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>