diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-10-11 18:14:37 +0200 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-10-11 18:14:37 +0200 |
| commit | 8154c245dd2f7aaee390e0206f460b9dd5b9f693 (patch) | |
| tree | eb781b36ba45780c13a71dfdb049fc232d96a99f /indra/newview/llcallfloater.h | |
| parent | c845925eebb5cad3049ee0f3b1d0adea3e3a46b5 (diff) | |
EXP-1281 FIXED (As a FUI user, I want all bottom bar floaters to become independent)
Made bottom bar dependent floaters independent from it. Also some LLTransientDockableFloaters are just LLFLoaters now.
Note: IM Floater and SysWellWindow will be made independent within EXP-1276
Diffstat (limited to 'indra/newview/llcallfloater.h')
| -rw-r--r-- | indra/newview/llcallfloater.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index ea78cd53b7..7282f7a8be 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -28,7 +28,7 @@ #ifndef LL_LLCALLFLOATER_H #define LL_LLCALLFLOATER_H -#include "lltransientdockablefloater.h" +#include "llfloater.h" #include "llvoicechannel.h" #include "llvoiceclient.h" @@ -262,9 +262,6 @@ private: */ static LLVoiceChannel* sCurrentVoiceChannel; - /* virtual */ - LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::IM; } - boost::signals2::connection mVoiceChannelStateChangeConnection; }; |