diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-29 17:55:35 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-29 17:55:35 +0200 |
| commit | 8f91db2e80d0e66432847f7056775a567a8b4fe6 (patch) | |
| tree | 482ca5415a047d319284d9280dfeaac2ef94393a /indra/newview/llcallfloater.h | |
| parent | b798a63d120dcfe4751d0bb56f6a2fcaafdd9966 (diff) | |
| parent | 6a4ec2873fb3e518a2428071a37d9116ba5dccc4 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.h')
| -rw-r--r-- | indra/newview/llcallfloater.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index 8646300dd7..8aba93fc43 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -34,7 +34,7 @@ #ifndef LL_LLCALLFLOATER_H #define LL_LLCALLFLOATER_H -#include "lldockablefloater.h" +#include "lltransientdockablefloater.h" #include "llvoicechannel.h" #include "llvoiceclient.h" @@ -55,7 +55,7 @@ class LLSpeakerMgr; * When the Resident is engaged in any chat except Nearby Chat, the Voice Control Panel also provides an * 'Leave Call' button to allow the Resident to leave that voice channel. */ -class LLCallFloater : public LLDockableFloater, LLVoiceClientParticipantObserver +class LLCallFloater : public LLTransientDockableFloater, LLVoiceClientParticipantObserver { public: |