summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_preferences_general.xml
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-01-11 14:18:36 -0800
committerMerov Linden <merov@lindenlab.com>2013-01-11 14:18:36 -0800
commit9f8959d480d1069f554c576a4cc9a494559ef1e4 (patch)
tree7ae4f550c1039cdb15d0087a0511310dddf8b5a5 /indra/newview/skins/default/xui/en/panel_preferences_general.xml
parentd16757545c91d4f7dac3c52a311ad0f0239052e1 (diff)
parent573ab07a40acc78e28ae390331d862d3f858bb07 (diff)
Pull merge from viewer-chui
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_general.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 24882988b0..ea0f7d8593 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -409,10 +409,10 @@
name="text_box3"
top_pad="3"
width="240">
- Busy mode response:
+ Do Not Disturb response:
</text>
<text_editor
- control_name="BusyModeResponse"
+ control_name="DoNotDisturbModeResponse"
text_readonly_color="LabelDisabledColor"
bg_writeable_color="LtGray"
use_ellipses="false"
@@ -421,7 +421,7 @@
height="29"
layout="topleft"
left="30"
- name="busy_response"
+ name="do_not_disturb_response"
width="470"
word_wrap="true">
log_in_to_change