From b0ed2ab7d92d79f0bb7005a7533c5c0e42f5bce7 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 23 Dec 2009 16:50:16 +0200
Subject: Work on normal task EXT-3636 (Code Improvements: Voice control panels
 - Make Voice states and fade timeout xml driven) -- made timeout to fade HAS
 LEFT Voice participant xml driven

--HG--
branch : product-engine
---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llcallfloater.cpp         | 11 ++++-------
 indra/newview/llcallfloater.h           |  6 ------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 455c3587ff..c6abb7ba26 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10378,6 +10378,17 @@
       <key>Value</key>
       <string>Default</string>
     </map>
+    <key>VoiceParticipantLeftRemoveDelay</key>
+    <map>
+      <key>Comment</key>
+      <string>Timeout to remove participants who has left Voice chat from the list in Voice Controls Panel</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>10</integer>
+    </map>
     <key>VoicePort</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 29f37a04b4..a02a30a710 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -95,12 +95,6 @@ BOOL LLCallFloater::LLAvatarListItemRemoveTimer::tick()
 	return TRUE;
 }
 
-
-LLCallFloater::Params::Params()
-: voice_left_remove_delay("voice_left_remove_delay", 10)
-{
-}
-
 LLCallFloater::LLCallFloater(const LLSD& key)
 : LLDockableFloater(NULL, false, key)
 , mSpeakerManager(NULL)
@@ -112,8 +106,11 @@ LLCallFloater::LLCallFloater(const LLSD& key)
 , mSpeakingIndicator(NULL)
 , mIsModeratorMutedVoice(false)
 , mInitParticipantsVoiceState(false)
-, mVoiceLeftRemoveDelay(10) // TODO: mantipov: make xml driven
+, mVoiceLeftRemoveDelay(10)
 {
+	static LLUICachedControl<S32> voice_left_remove_delay ("VoiceParticipantLeftRemoveDelay", 10);
+	mVoiceLeftRemoveDelay = voice_left_remove_delay;
+
 	mFactoryMap["non_avatar_caller"] = LLCallbackMap(create_non_avatar_caller, NULL);
 	LLVoiceClient::getInstance()->addObserver(this);
 	LLTransientFloaterMgr::getInstance()->addControlView(this);
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index 537c57f671..ee3bc9b9fe 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -57,12 +57,6 @@ class LLSpeakerMgr;
 class LLCallFloater : public LLDockableFloater, LLVoiceClientParticipantObserver
 {
 public:
-	struct Params :	public LLInitParam::Block<Params, LLDockableFloater::Params>
-	{
-		Optional<S32>			voice_left_remove_delay;
-
-		Params();
-	};
 
 	LOG_CLASS(LLCallFloater);
 
-- 
cgit v1.2.3