diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-07 12:34:21 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-07 12:34:21 +0300 |
| commit | d9309bd16334a7d76da1b02e8fc43117a06ef7b2 (patch) | |
| tree | 163be0f48af5b331cd28f6b0f21fd84eef516548 /indra/newview/llnearbychathandler.cpp | |
| parent | 47fe3b48fe32f9eb810a23d82eb08c11c41ac335 (diff) | |
CHUI-323 FIXED (Local chat message panel out of position in Conversation floater):
Prevented too early creation LLNearbyChat
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index ca3fffeffd..f3e17ea61b 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -487,6 +487,8 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, if(chat_msg.mText.empty()) return;//don't process empty messages + LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat"); + // Build notification data LLSD chat; chat["message"] = chat_msg.mText; @@ -537,7 +539,6 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, } } - LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat"); nearby_chat->addMessage(chat_msg, true, args); if(chat_msg.mSourceType == CHAT_SOURCE_AGENT |