summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.h
diff options
context:
space:
mode:
authorYuri Chebotarev ychebotarev@productengine.com <Yuri Chebotarev ychebotarev@productengine.com>2009-10-26 15:49:50 +0200
committerYuri Chebotarev ychebotarev@productengine.com <Yuri Chebotarev ychebotarev@productengine.com>2009-10-26 15:49:50 +0200
commite4b3b5f7df55df49f1253cf5fa7bd728e1fbb094 (patch)
treed226e8b06184ec9b49066bd18df30a7de25dc980 /indra/newview/llimview.h
parent88f2d107c0a757b9cc6dee7c30a9482c02a05c08 (diff)
parent27b65de2242135d35e189eeec685ae90ba56b505 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llimview.h')
-rw-r--r--indra/newview/llimview.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 79513fb7d5..6991017e8f 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -183,7 +183,7 @@ public:
};
LLIMMgr();
- virtual ~LLIMMgr();
+ virtual ~LLIMMgr() {};
// Add a message to a session. The session can keyed to sesion id
// or agent id.
@@ -245,9 +245,6 @@ public:
void processIMTypingStart(const LLIMInfo* im_info);
void processIMTypingStop(const LLIMInfo* im_info);
- // Rebuild stuff
- void refresh();
-
void notifyNewIM();
void clearNewIMNotification();
@@ -263,10 +260,6 @@ public:
// good connection.
void disconnectAllSessions();
- // This is a helper function to determine what kind of im session
- // should be used for the given agent.
- static EInstantMessage defaultIMTypeForAgent(const LLUUID& agent_id);
-
BOOL hasSession(const LLUUID& session_id);
// This method returns the im panel corresponding to the uuid
@@ -285,6 +278,7 @@ public:
void clearPendingAgentListUpdates(const LLUUID& session_id);
//HACK: need a better way of enumerating existing session, or listening to session create/destroy events
+ //@deprecated, is used only by LLToolBox, which is not used anywhere, right? (IB)
const std::set<LLHandle<LLFloater> >& getIMFloaterHandles() { return mFloaters; }
void addSessionObserver(LLIMSessionObserver *);
@@ -335,8 +329,9 @@ private:
void notifyObserverSessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id);
private:
+
+ //*TODO should be deleted when Communicate Floater is being deleted
std::set<LLHandle<LLFloater> > mFloaters;
- LLFriendObserver* mFriendObserver;
typedef std::list <LLIMSessionObserver *> session_observers_list_t;
session_observers_list_t mSessionObservers;