From 69f81d5bb6390ed4b3c766fc64605d6f15d5df31 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 14:58:37 -0800
Subject: [PATCH] CHUI-517: Updating the do not disturb message automatically
sent to other users when they attempt to contact a person in do not disturb
mode.
---
indra/newview/app_settings/settings_per_account.xml | 2 +-
indra/newview/llviewermessage.cpp | 4 +---
indra/newview/skins/default/xui/en/strings.xml | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 8126e20b1bf..ca22041671f 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -20,7 +20,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
+ <string>This resident has turned on 'Do Not Disturb' and will see your message later.</string>
</map>
<key>ConversationsExpandMessagePaneFirst</key>
<map>
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 47249fad709..56c9f81259f 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2941,9 +2941,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
else
{
- // TODO: after LLTrans hits release, get "busy response" into translatable file
- buffer = llformat("%s (%s): %s", name.c_str(), "busy response", message.c_str());
- gIMMgr->addMessage(session_id, from_id, name, buffer);
+ gIMMgr->addMessage(session_id, from_id, name, message);
}
break;
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f873bfe6c76..79ee83969b4 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2520,7 +2520,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
<string name="PanelContentsNewScript">New Script</string>
<!-- panel preferences general -->
- <string name="DoNotDisturbModeResponseDefault">The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
+ <string name="DoNotDisturbModeResponseDefault">This resident has turned on 'Do Not Disturb' and will see your message later.</string>
<!-- Mute -->
<string name="MuteByName">(By name)</string>
--
GitLab