diff options
| author | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
| commit | 1df1be10afd14fe80d491617e175f4586a78f71f (patch) | |
| tree | 6e7a55591c2166ae732a7854f329e9bfd800546b /indra/newview/llnearbychathandler.cpp | |
| parent | 75e5441f2da7252749174db70719a78637bc4eeb (diff) | |
| parent | b20307a683073c415804966ed5b363fb68879ee5 (diff) | |
merge
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 a211adc79d..08ae93c3a6 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -176,10 +176,11 @@ void LLNearbyChatScreenChannel::addNotification(LLSD& notification) if(m_active_toasts.size()) { LLUUID fromID = notification["from_id"].asUUID(); // agent id or object id + std::string from = notification["from"].asString(); LLToast* toast = m_active_toasts[0]; LLNearbyChatToastPanel* panel = dynamic_cast<LLNearbyChatToastPanel*>(toast->getPanel()); - if(panel && panel->messageID() == fromID && panel->canAddText()) + if(panel && panel->messageID() == fromID && panel->getFromName() == from && panel->canAddText()) { panel->addMessage(notification); toast->reshapeToPanel(); |