diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:02:35 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:02:35 +0000 |
| commit | 2490f50ce1bc7ffe1e53a99e4081bee13253f09a (patch) | |
| tree | 1f2de35440c436795e68c118634a5ab0b2321c72 /indra/newview/llcallfloater.h | |
| parent | 29dd5afaa8a85f0b57ddb3e9e281e1e6f5b43e29 (diff) | |
| parent | f52e7036940a015a405ae94aa016612c4160df9e (diff) | |
PE merge.
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; }; |