diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-17 15:22:39 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-17 15:22:39 +0200 |
| commit | 2ab4bf8b35bed067a1e7871e921e489fdc8322aa (patch) | |
| tree | 44f7fa5b40a60a4575761045e2c893069a702e75 /indra/newview/llcallfloater.h | |
| parent | c826e5606e834374e4488e8504c6ffce2d137584 (diff) | |
fixed EXT-5378 “Transient exception manager doesn't work if switch to tabbed IM window”,
added side tray tab to global group of transient exception list;
added LLIMFloaterContainer to IM group of transient exception list;
made VCP belongs to IM transient group;
--HG--
branch : product-engine
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; }; |