Skip to content
Snippets Groups Projects
Commit b0ed2ab7 authored by Mike Antipov's avatar Mike Antipov
Browse files

Work on normal task EXT-3636 (Code Improvements: Voice control panels - Make...

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
parent 15fb7171
Branches
Tags
No related merge requests found
...@@ -10378,6 +10378,17 @@ ...@@ -10378,6 +10378,17 @@
<key>Value</key> <key>Value</key>
<string>Default</string> <string>Default</string>
</map> </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> <key>VoicePort</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
......
...@@ -95,12 +95,6 @@ BOOL LLCallFloater::LLAvatarListItemRemoveTimer::tick() ...@@ -95,12 +95,6 @@ BOOL LLCallFloater::LLAvatarListItemRemoveTimer::tick()
return TRUE; return TRUE;
} }
LLCallFloater::Params::Params()
: voice_left_remove_delay("voice_left_remove_delay", 10)
{
}
LLCallFloater::LLCallFloater(const LLSD& key) LLCallFloater::LLCallFloater(const LLSD& key)
: LLDockableFloater(NULL, false, key) : LLDockableFloater(NULL, false, key)
, mSpeakerManager(NULL) , mSpeakerManager(NULL)
...@@ -112,8 +106,11 @@ LLCallFloater::LLCallFloater(const LLSD& key) ...@@ -112,8 +106,11 @@ LLCallFloater::LLCallFloater(const LLSD& key)
, mSpeakingIndicator(NULL) , mSpeakingIndicator(NULL)
, mIsModeratorMutedVoice(false) , mIsModeratorMutedVoice(false)
, mInitParticipantsVoiceState(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); mFactoryMap["non_avatar_caller"] = LLCallbackMap(create_non_avatar_caller, NULL);
LLVoiceClient::getInstance()->addObserver(this); LLVoiceClient::getInstance()->addObserver(this);
LLTransientFloaterMgr::getInstance()->addControlView(this); LLTransientFloaterMgr::getInstance()->addControlView(this);
......
...@@ -57,12 +57,6 @@ class LLSpeakerMgr; ...@@ -57,12 +57,6 @@ class LLSpeakerMgr;
class LLCallFloater : public LLDockableFloater, LLVoiceClientParticipantObserver class LLCallFloater : public LLDockableFloater, LLVoiceClientParticipantObserver
{ {
public: public:
struct Params : public LLInitParam::Block<Params, LLDockableFloater::Params>
{
Optional<S32> voice_left_remove_delay;
Params();
};
LOG_CLASS(LLCallFloater); LOG_CLASS(LLCallFloater);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment