diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-10-13 12:37:12 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-10-13 12:37:12 -0700 |
| commit | 2f9da3671233b3c79ce326464b59cb3790181c66 (patch) | |
| tree | 95f50c91d1a3009b53b2af467799fc9864ef3e50 /indra/newview/app_settings/settings.xml | |
| parent | c7c43d83f80dcac8be79cc76c9d9bbf8ff4c8354 (diff) | |
| parent | 17a04f8231a0787a7e72c7b3ad5cf37b08a466d0 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 742a20a849..c74ec8231d 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> |