From 1bad68eb4b7d712b02cbd4b74639fcf265983c8d Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 8 May 2008 22:23:20 +0000
Subject: [PATCH] svn merge -r 86553:86607
svn+ssh://svn.lindenlab.com/svn/linden/branches/secure-im --> release
QAR-564 - constrained fix for SEC-71
---
indra/newview/llviewermessage.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e09af2ea45d..577e76b957c 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1959,6 +1959,8 @@ void busy_message (LLMessageSystem* msg, LLUUID from_id)
{
if (gAgent.getBusy())
{
+ std::string my_name;
+ gAgent.buildFullname(my_name);
LLString response = gSavedPerAccountSettings.getText("BusyModeResponse");
pack_instant_message(
gMessageSystem,
@@ -1966,10 +1968,10 @@ void busy_message (LLMessageSystem* msg, LLUUID from_id)
FALSE,
gAgent.getSessionID(),
from_id,
- SYSTEM_FROM,
+ my_name.c_str(),
response.c_str(),
IM_ONLINE,
- IM_CONSOLE_AND_CHAT_HISTORY);
+ IM_BUSY_AUTO_RESPONSE);
gAgent.sendReliableMessage();
}
}
--
GitLab