From d2b32564b8b6b19952e284b68ab86bc5d2d76242 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 3 Mar 2019 22:23:03 -0500 Subject: [PATCH] Stop typing AO when AO disabled --- indra/newview/floaterao.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/floaterao.cpp b/indra/newview/floaterao.cpp index 5b37a0db1..5485650c5 100644 --- a/indra/newview/floaterao.cpp +++ b/indra/newview/floaterao.cpp @@ -416,9 +416,10 @@ void LLFloaterAO::run() { setAnimationState(STATE_AGENT_IDLE); // reset state AOState state = getAnimationState(); // check if sitting or hovering + bool enabled = gSavedSettings.getBOOL("AOEnabled"); if (state == STATE_AGENT_IDLE || state == STATE_AGENT_STAND) { - if (gSavedSettings.getBOOL("AOEnabled")) + if (enabled) { if (mAOStandTimer) { @@ -448,8 +449,10 @@ void LLFloaterAO::run() break; default: break; } - gAgent.sendAnimationRequest(GetAnimIDFromState(state), (gSavedSettings.getBOOL("AOEnabled") && (!sit || gSavedSettings.getBOOL("AOSitsEnabled"))) ? ANIM_REQUEST_START : ANIM_REQUEST_STOP); + gAgent.sendAnimationRequest(GetAnimIDFromState(state), (enabled && (!sit || gSavedSettings.getBOOL("AOSitsEnabled"))) ? ANIM_REQUEST_START : ANIM_REQUEST_STOP); } + if (!enabled) // Stop typing AO the moment we turn off AO + gAgent.sendAnimationRequest(GetAnimIDFromState(STATE_AGENT_TYPING), ANIM_REQUEST_STOP); } void LLFloaterAO::typing(bool start)