diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 11:17:52 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 11:17:52 -0800 |
commit | 7ff2bfd0af6e124d74a7c1c9532fcffff5e0d7fe (patch) | |
tree | a0ec093a39c82f2bdd25ee0660f27ebb7f929116 /indra/newview/llcallingcard.cpp | |
parent | c8e97d83bd330103a24755692e3d409015be5a66 (diff) | |
parent | 5b7f40df4e2125cee36fdeed53a10e6ebd624929 (diff) |
merge changes from product-engine
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
-rw-r--r-- | indra/newview/llcallingcard.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index 7a81d0c4a1..e8812d87ee 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -62,7 +62,6 @@ #include "llviewerwindow.h" #include "llvoavatar.h" #include "llimview.h" -#include "llimpanel.h" ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs @@ -719,18 +718,8 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online) // If there's an open IM session with this agent, send a notification there too. LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id); - LLFloaterIMPanel *floater = gIMMgr->findFloaterBySession(session_id); - if (floater) - { - std::string notifyMsg = notification->getMessage(); - if (!notifyMsg.empty()) - { - floater->addHistoryLine(notifyMsg,LLUIColorTable::instance().getColor("SystemChatColor")); - } - } - - //*TODO instead of adding IM message about online/offline status - //do something like graying avatar icon on messages from a user that went offline, and make it colored when online. + std::string notify_msg = notification->getMessage(); + LLIMModel::instance().proccessOnlineOfflineNotification(session_id, notify_msg); } mModifyMask |= LLFriendObserver::ONLINE; |