diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
| commit | 682609d254fb973cfa267923b69c5e06b7efd7e1 (patch) | |
| tree | 0063e23841b6e3bb588355ad428608bb1f4fcdf9 /indra/newview/llcallfloater.h | |
| parent | 3596c0f7e139724f31258ffb96157146aeba77b1 (diff) | |
| parent | c1a9ca33b27f4e741eeacf781a09156009167ad3 (diff) | |
Pull from richard/viewer-experience-fui
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; }; |