From 2ab4bf8b35bed067a1e7871e921e489fdc8322aa Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Wed, 17 Feb 2010 15:22:39 +0200 Subject: =?UTF-8?q?fixed=20EXT-5378=20=E2=80=9CTransient=20exception=20man?= =?UTF-8?q?ager=20doesn't=20work=20if=20switch=20to=20tabbed=20IM=20window?= =?UTF-8?q?=E2=80=9D,=20added=20side=20tray=20tab=20to=20global=20group=20?= =?UTF-8?q?of=20transient=20exception=20list;=20added=20LLIMFloaterContain?= =?UTF-8?q?er=20to=20IM=20group=20of=20transient=20exception=20list;=20mad?= =?UTF-8?q?e=20VCP=20belongs=20to=20IM=20transient=20group;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llcallfloater.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llcallfloater.h') 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; }; -- cgit v1.2.3