summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-12-29 17:55:20 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-12-29 17:55:20 +0200
commit6a4ec2873fb3e518a2428071a37d9116ba5dccc4 (patch)
tree94c67e9eccd9b05fcfea1eea88b705a21fa54558
parenta395edd9a08406526a09dcda6e14d3d3c9542985 (diff)
fixed EXT-3742 “Voice Control Panel should auto-hide”,
made VCP as transient dockable floater; --HG-- branch : product-engine
-rw-r--r--indra/newview/llcallfloater.cpp6
-rw-r--r--indra/newview/llcallfloater.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 334bdd14b4..56911562e4 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -103,7 +103,7 @@ BOOL LLCallFloater::LLAvatarListItemRemoveTimer::tick()
LLVoiceChannel* LLCallFloater::sCurrentVoiceCanel = NULL;
LLCallFloater::LLCallFloater(const LLSD& key)
-: LLDockableFloater(NULL, false, key)
+: LLTransientDockableFloater(NULL, false, key)
, mSpeakerManager(NULL)
, mParticipants(NULL)
, mAvatarList(NULL)
@@ -145,7 +145,7 @@ LLCallFloater::~LLCallFloater()
// virtual
BOOL LLCallFloater::postBuild()
{
- LLDockableFloater::postBuild();
+ LLTransientDockableFloater::postBuild();
mAvatarList = getChild<LLAvatarList>("speakers_list");
mAvatarListRefreshConnection = mAvatarList->setRefreshCompleteCallback(boost::bind(&LLCallFloater::onAvatarListRefreshed, this));
@@ -197,7 +197,7 @@ void LLCallFloater::draw()
if (mParticipants)
mParticipants->updateRecentSpeakersOrder();
- LLDockableFloater::draw();
+ LLTransientDockableFloater::draw();
}
// virtual
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index 2b856b9c32..7bba244acf 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: