diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-26 12:59:19 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-26 12:59:19 +0200 |
| commit | 6912ada083fbfd249fa3d68ba4121649171eb2d1 (patch) | |
| tree | 02ad4934a914ef75c70725a499456229c85e956f /indra/newview/llcallfloater.h | |
| parent | b884eede5126309bcb1742555ea14308efaa9f20 (diff) | |
| parent | e2f4ad93ed0dd28673ea00622f9fabdfaa0829cd (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.h')
| -rw-r--r-- | indra/newview/llcallfloater.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index f1afddb1cc..8c4a204943 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -34,7 +34,7 @@ #ifndef LL_LLCALLFLOATER_H #define LL_LLCALLFLOATER_H -#include "llfloater.h" +#include "lldockablefloater.h" class LLAvatarList; class LLParticipantList; @@ -51,10 +51,10 @@ class LLSpeakerMgr; * When the Resident is engaged in Group Voice Chat, the Voice Control Panel also provides an * 'End Call' button to allow the Resident to leave that voice channel. */ -class LLCallFloater : public LLFloater +class LLCallFloater : public LLDockableFloater { public: - LLCallFloater(); + LLCallFloater(const LLSD& key); ~LLCallFloater(); /*virtual*/ BOOL postBuild(); |