diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 11:13:54 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 11:13:54 -0500 |
| commit | 1ca9c1dcfef3a935be30a5322c91d5e3df523a98 (patch) | |
| tree | 50aa5ccc5924d4296454dd3e8dcee7edddaf520b /indra/newview/llcallfloater.h | |
| parent | 1ae70e112a466a6ed5baf4e05c1771218c78b2f5 (diff) | |
| parent | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
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; }; |