summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2009-11-24 20:57:41 +0200
committerEugene Mutavchi <emutavchi@productengine.com>2009-11-24 20:57:41 +0200
commit3d2fbad4cafae520f790f97dad6b4eb6a0363751 (patch)
tree045b66b5d3783f53dbf2092e88c93145d9dfcecc
parent240c21cc2dd82dd41a664ec225fafb24bab44ca6 (diff)
Fixed normal bug EXT-2570 (There is no connecting/leaving spatial voice chat notifications in the nearby chat)
--HG-- branch : product-engine
-rw-r--r--indra/newview/llimview.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index c066f1f77a..ffa943092f 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -71,6 +71,7 @@
#include "llviewermessage.h"
#include "llviewerwindow.h"
#include "llnotify.h"
+#include "llnearbychat.h"
#include "llviewerregion.h"
#include "llvoicechannel.h"
#include "lltrans.h"
@@ -1611,6 +1612,12 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess
LLChat chat(message);
chat.mSourceType = CHAT_SOURCE_SYSTEM;
LLFloaterChat::addChatHistory(chat);
+
+ LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
+ if(nearby_chat)
+ {
+ nearby_chat->addMessage(chat);
+ }
}
else // going to IM session
{