diff options
| author | callum <none@none> | 2011-10-11 11:32:05 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-11 11:32:05 -0700 |
| commit | c1a9ca33b27f4e741eeacf781a09156009167ad3 (patch) | |
| tree | fe7dad57f407e60c6ad0e910a0231d1b420d8899 /indra/newview/llcallfloater.h | |
| parent | 28b97b2478aadc44b41cc99c220e94206def4347 (diff) | |
| parent | 8154c245dd2f7aaee390e0206f460b9dd5b9f693 (diff) | |
EXP-1281 Merge with PE code https://hg.lindenlab.com/paulgproductengine/exp-1281/
Changeset: 20897:084550ee5c06
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; }; |