summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.h
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-07-27 15:38:03 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-07-27 15:38:03 -0700
commitc1aa0cc4fcd4642a7849b0b56dd1b777536e4f92 (patch)
tree921c8ee2c4ae29210b9c59cdaef01f9c9388be01 /indra/newview/llimfloater.h
parent0479e8d4ad1212b0028805cd4e39b6fe593b86c7 (diff)
parentca7b9a944b164602cd8b11bf6512f790743964f3 (diff)
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llimfloater.h')
-rw-r--r--indra/newview/llimfloater.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h
index 2ac11ded20..7e45cf42c2 100644
--- a/indra/newview/llimfloater.h
+++ b/indra/newview/llimfloater.h
@@ -44,6 +44,8 @@ class LLChatHistory;
class LLInventoryItem;
class LLInventoryCategory;
+typedef boost::signals2::signal<void(const LLUUID& session_id)> floater_showed_signal_t;
+
/**
* Individual IM window that appears at the bottom of the screen,
* optionally "docked" to the bottom tray.
@@ -125,7 +127,11 @@ public:
bool getStartConferenceInSameFloater() const { return mStartConferenceInSameFloater; }
+ static boost::signals2::connection setIMFloaterShowedCallback(const floater_showed_signal_t::slot_type& cb);
+ static floater_showed_signal_t sIMFloaterShowedSignal;
+
private:
+
// process focus events to set a currently active session
/* virtual */ void onFocusLost();
/* virtual */ void onFocusReceived();