summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-09 11:25:45 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-09 11:25:45 +0100
commit59a90f197f9b36077f20da4de5945ed93526df26 (patch)
treec433bc16dac6116925399af1382b7737ab1c26af /indra/newview/app_settings
parent95e9e569bfaf713eb71f3dba7206aceae06f74f6 (diff)
parent4ed913c3760308ea67db8beb9e6330933104a8ab (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings_per_account.xml25
1 files changed, 7 insertions, 18 deletions
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index dc76a4e518..3ce32a05b0 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -1,26 +1,26 @@
<llsd>
<map>
- <key>BusyResponseChanged</key>
+ <key>BusyModeResponse</key>
<map>
<key>Comment</key>
- <string>Does user's busy mode message differ from default?</string>
+ <string>Auto response to instant messages while in busy mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string>The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
</map>
- <key>BusyModeResponse</key>
+ <key>BusyModeResponse2</key>
<map>
<key>Comment</key>
- <string>Auto response to instant messages while in busy mode.</string>
+ <string>Auto response to instant messages while in busy mode, clean (unencoded) version of BusyModeResponse</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
+ <string>|TOKEN COPY BusyModeResponse|</string>
</map>
<key>InstantMessageLogPath</key>
<map>
@@ -99,17 +99,6 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>VoiceEffectDefault</key>
- <map>
- <key>Comment</key>
- <string>Selected Voice Morph</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string>00000000-0000-0000-0000-000000000000</string>
- </map>
<!-- Settings below are for back compatibility only.
They are not used in current viewer anymore. But they can't be removed to avoid