Skip to content

Commit 99937bf

Browse files
committed
viewer#2884 Cleanup
1 parent 012f742 commit 99937bf

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

indra/newview/llvoicewebrtc.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,10 @@ void LLWebRTCVoiceClient::stopTimer()
302302
{
303303
if (mIsTimerActive)
304304
{
305+
LLMuteList::instanceExists();
306+
{
307+
LLMuteList::getInstance()->removeObserver(this);
308+
}
305309
mIsTimerActive = false;
306310
LL::Timers::instance().cancel(mVoiceTimerHandle);
307311
}
@@ -470,13 +474,6 @@ void LLWebRTCVoiceClient::connectionTimer()
470474
LL_PROFILE_ZONE_SCOPED_CATEGORY_VOICE;
471475
try
472476
{
473-
// TODO: Doing some measurement and calculation here,
474-
// we could reduce the timeout to take into account the
475-
// time spent on the previous loop to have the loop
476-
// cycle at exactly 100ms, instead of 100ms + loop
477-
// execution time.
478-
// Could help with voice updates making for smoother
479-
// voice when we're busy.
480477
bool voiceEnabled = mVoiceEnabled;
481478

482479
if (!isAgentAvatarValid())
@@ -1577,7 +1574,6 @@ void LLWebRTCVoiceClient::setVoiceEnabled(bool enabled)
15771574
LL_DEBUGS("Voice") << "Starting" << LL_ENDL;
15781575
mIsTimerActive = true;
15791576
LLMuteList::getInstance()->addObserver(this);
1580-
const F32 SECS_BETWEEN_REQUESTS = 0.5f;
15811577
mVoiceTimerHandle = LL::Timers::instance().scheduleEvery([this]() { connectionTimer(); return false; }, UPDATE_THROTTLE_SECONDS);
15821578
}
15831579
else

0 commit comments

Comments
 (0)