From 370aa671c66cfd5e2a338602d2e9765e9ea103f8 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Fri, 15 Aug 2014 18:49:54 -0700 Subject: Allegedly hides voice position on teleport. Needs testing. --- indra/newview/llagent.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/llagent.cpp') diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index bd6025feea..059f21e91e 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3802,6 +3802,10 @@ void LLAgent::restartFailedTeleportRequest() void LLAgent::clearTeleportRequest() { + if(LLVoiceClient::instanceExists()) + { + LLVoiceClient::getInstance()->setHidden(FALSE); + } mTeleportRequest.reset(); } @@ -3820,6 +3824,10 @@ bool LLAgent::hasPendingTeleportRequest() void LLAgent::startTeleportRequest() { + if(LLVoiceClient::instanceExists()) + { + LLVoiceClient::getInstance()->setHidden(TRUE); + } if (hasPendingTeleportRequest()) { if (!isMaturityPreferenceSyncedWithServer()) -- cgit v1.2.3 From e8adc1d008fbe704798f3b5820fca38ba9abeb48 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 26 Aug 2014 11:53:57 +0300 Subject: MAINT-4322 FIXED Re-assert DND tag animation if it was cancelled by script, when DND mode is still active --- indra/newview/llagent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llagent.cpp') diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index e5a90e8a28..ef1d528aa2 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4116,8 +4116,8 @@ void LLAgent::stopCurrentAnimations() anim_it != gAgentAvatarp->mPlayingAnimations.end(); anim_it++) { - if (anim_it->first == - ANIM_AGENT_SIT_GROUND_CONSTRAINED) + if ((anim_it->first == ANIM_AGENT_DO_NOT_DISTURB)|| + (anim_it->first == ANIM_AGENT_SIT_GROUND_CONSTRAINED)) { // don't cancel a ground-sit anim, as viewers // use this animation's status in -- cgit v1.2.3 From e44dfc0a4eb2c1dc63592f8ced7e35debbbf6238 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Mon, 8 Sep 2014 13:55:23 -0700 Subject: Fix position hiding on failed teleports on mac. --- indra/newview/llagent.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llagent.cpp') diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 059f21e91e..43e2b22689 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3873,6 +3873,11 @@ void LLAgent::handleTeleportFinished() void LLAgent::handleTeleportFailed() { + if(LLVoiceClient::instanceExists()) + { + LLVoiceClient::getInstance()->setHidden(FALSE); + } + if (mTeleportRequest != NULL) { mTeleportRequest->setStatus(LLTeleportRequest::kFailed); -- cgit v1.2.3