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
meow-7.2.2
Mike Antipov 2009-12-23 16:50:16 +02:00
parent 15fb717118
commit b0ed2ab7d9
3 changed files with 15 additions and 13 deletions

View File

@ -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>

View File

@ -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);

View File

@ -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);