diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:54:47 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:54:47 +0000 |
commit | b31d7cb22f1ab51428bdfbae6d252d7c22167b7a (patch) | |
tree | 0202d447218fade13c7e9f87972d7c4966174d47 /indra/newview/llcallfloater.h | |
parent | 2398ac98d01d3809904759251e2c98cf2740e139 (diff) | |
parent | 2490f50ce1bc7ffe1e53a99e4081bee13253f09a (diff) |
merge from viewer2.
Diffstat (limited to 'indra/newview/llcallfloater.h')
-rw-r--r-- | indra/newview/llcallfloater.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index dac4390fa7..0a8ea7de39 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -260,6 +260,10 @@ private: * @see sOnCurrentChannelChanged() */ static LLVoiceChannel* sCurrentVoiceCanel; + + /* virtual */ + LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::IM; } + boost::signals2::connection mVoiceChannelStateChangeConnection; }; |