diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-27 19:45:38 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-27 19:45:38 -0700 |
| commit | 1bdfe7ec471efb94acc4a8f98e8084c08199c9da (patch) | |
| tree | 93f844ff1083d18bd076b6f884ab0a22cbf530ae /indra/newview/llimview.cpp | |
| parent | 3a473bd8ca301a5cd7e0284e40da890d598d394d (diff) | |
| parent | 9eef4b6c569b48975cd74ef80b1393febe1387d8 (diff) | |
EXP-1202 : pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 4de6976534..4602533736 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2449,8 +2449,10 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess LLChat chat(message); chat.mSourceType = CHAT_SOURCE_SYSTEM; + + LLFloater* chat_bar = LLFloaterReg::getInstance("chat_bar"); + LLNearbyChat* nearby_chat = chat_bar->findChild<LLNearbyChat>("nearby_chat"); - LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); if(nearby_chat) { nearby_chat->addMessage(chat); |