Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop typing AO when AO disabled

Browse Source
This commit is contained in:
Lirusaito
2019-03-03 22:23:03 -05:00
parent c847bfb6a5
commit d2b32564b8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/floaterao.cpp
View File

@@ -416,9 +416,10 @@ void LLFloaterAO::run()
{ {
setAnimationState(STATE_AGENT_IDLE); // reset state setAnimationState(STATE_AGENT_IDLE); // reset state
AOState state = getAnimationState(); // check if sitting or hovering AOState state = getAnimationState(); // check if sitting or hovering
bool enabled = gSavedSettings.getBOOL("AOEnabled");
if (state == STATE_AGENT_IDLE || state == STATE_AGENT_STAND) if (state == STATE_AGENT_IDLE || state == STATE_AGENT_STAND)
{ {
if (gSavedSettings.getBOOL("AOEnabled")) if (enabled)
{ {
if (mAOStandTimer) if (mAOStandTimer)
{ {
@@ -448,8 +449,10 @@ void LLFloaterAO::run()
break; break;
default: 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) void LLFloaterAO::typing(bool start)