summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloatercontainer.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-02 17:15:46 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-02 17:15:46 -0500
commitf22fc1e6129a7e56421a0777d69c64265d9ec4af (patch)
tree43dc78b1795ef407db7b9124472626fa77ae6621 /indra/newview/llimfloatercontainer.h
parent847a3a12208359653aa7432f7f64c31669ec8963 (diff)
parente3344abb95802646912f357d214538966f3f2357 (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llimfloatercontainer.h')
-rw-r--r--indra/newview/llimfloatercontainer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h
index e4a32dbe1d..bc06f0cbd3 100644
--- a/indra/newview/llimfloatercontainer.h
+++ b/indra/newview/llimfloatercontainer.h
@@ -66,10 +66,12 @@ public:
static LLIMFloaterContainer* getInstance();
private:
- typedef std::map<LLUUID,LLPanel*> avatarID_panel_map_t;
+ typedef std::map<LLUUID,LLFloater*> avatarID_panel_map_t;
avatarID_panel_map_t mSessions;
void onCloseFloater(LLUUID avatar_id);
+
+ void onNewMessageReceived(const LLSD& data);
};
#endif // LL_LLIMFLOATERCONTAINER_H