summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-11-08 17:15:44 -0800
committerMerov Linden <merov@lindenlab.com>2012-11-08 17:15:44 -0800
commit3d70cca7029cc536725088c8ff5d58ad0222eb64 (patch)
tree3bdc286929e7a2b913232f0a21137655b399bad5 /indra/newview/app_settings
parent1d590cd5fdecabbbf6e96be37a2673de347e2224 (diff)
parent5aa5a77af66425dd90599b0b0cad5b8f58d7669a (diff)
Pull merge from richard/viewer-chui.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings_per_account.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 1f637ef3ff..8126e20b1b 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -1,9 +1,9 @@
<llsd>
<map>
- <key>BusyResponseChanged</key>
+ <key>DoNotDisturbResponseChanged</key>
<map>
<key>Comment</key>
- <string>Does user's busy mode message differ from default?</string>
+ <string>Does user's do not disturb mode message differ from default?</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -11,10 +11,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>BusyModeResponse</key>
+ <key>DoNotDisturbModeResponse</key>
<map>
<key>Comment</key>
- <string>Auto response to instant messages while in busy mode.</string>
+ <string>Auto response to instant messages while in do not disturb mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>