diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-09-27 15:41:06 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-09-27 15:41:06 -0700 |
| commit | 0207d7e9e4e5b509b5905256a56ac2138b35cac3 (patch) | |
| tree | 904c34ad82f59d0515600b7745252036404f81f1 /indra/newview/llimview.cpp | |
| parent | cb699e3f2d64999e9817d0c4df5b7f9484e8e722 (diff) | |
EXP-1247 Nearby chat as part of chat floater
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); |