From 8103710c054ec6ea4a46f9732e569e543691184b Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 19 Oct 2009 01:45:44 +0000 Subject: Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231 * Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476 * IM changes --- indra/newview/llimview.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llimview.h') diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index df28c16bb1..84646a9a6f 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -56,6 +56,8 @@ public: const EInstantMessage& type, const LLUUID& other_participant_id, const std::vector& ids); virtual ~LLIMSession(); + void sessionInitReplyReceived(const LLUUID& new_session_id); + LLUUID mSessionID; std::string mName; EInstantMessage mType; @@ -153,6 +155,7 @@ public: virtual ~LLIMSessionObserver() {} virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) = 0; virtual void sessionRemoved(const LLUUID& session_id) = 0; + virtual void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id) = 0; }; @@ -304,6 +307,7 @@ private: void notifyObserverSessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id); void notifyObserverSessionRemoved(const LLUUID& session_id); + void notifyObserverSessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id); private: std::set > mFloaters; -- cgit v1.2.3