livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-20783 Fix excessive control messages 

controlFlagsDirty() gets set every frame as an example if 'w' is held,
causing viewer to send updates each frame, which can be excessive
meow-7.2.2
Andrey Kleshchev 2024-01-16 02:58:07 +02:00 committed by Andrey Kleshchev
parent 746788e789
commit a67dde1f16
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llappviewer.cpp
View File

@ -4681,16 +4681,23 @@ void LLAppViewer::idle()
// When appropriate, update agent location to the simulator. // When appropriate, update agent location to the simulator.
F32 agent_update_time = agent_update_timer.getElapsedTimeF32(); F32 agent_update_time = agent_update_timer.getElapsedTimeF32();
F32 agent_force_update_time = mLastAgentForceUpdate + agent_update_time; F32 agent_force_update_time = mLastAgentForceUpdate + agent_update_time;
BOOL force_update = gAgent.controlFlagsDirty() bool timed_out = agent_update_time > (1.0f / (F32)AGENT_UPDATES_PER_SECOND);
|| (mLastAgentControlFlags != gAgent.getControlFlags()) BOOL force_send =
|| (agent_force_update_time > (1.0f / (F32) AGENT_FORCE_UPDATES_PER_SECOND)); // if there is something to send
if (force_update || (agent_update_time > (1.0f / (F32) AGENT_UPDATES_PER_SECOND))) (gAgent.controlFlagsDirty() && timed_out)
// if something changed
|| (mLastAgentControlFlags != gAgent.getControlFlags())
// keep alive
|| (agent_force_update_time > (1.0f / (F32) AGENT_FORCE_UPDATES_PER_SECOND));
// timing out doesn't warranty that an update will be sent,
// just that it will be checked.
if (force_send || timed_out)
{ {
LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK; LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
// Send avatar and camera info // Send avatar and camera info
mLastAgentControlFlags = gAgent.getControlFlags(); mLastAgentControlFlags = gAgent.getControlFlags();
mLastAgentForceUpdate = force_update ? 0 : agent_force_update_time; mLastAgentForceUpdate = force_send ? 0 : agent_force_update_time;
send_agent_update(force_update); send_agent_update(force_send);
agent_update_timer.reset(); agent_update_timer.reset();
} }
} }