OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add a few extra checks for viewers animated objects support, to avoid timming issues

0.9.1.0-post-fixes
UbitUmarov 2019-03-19 00:47:45 +00:00
parent 199d4a1bd0
commit c2086e6257
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -1710,8 +1710,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_pendingCache.Remove(endPoint); m_pendingCache.Remove(endPoint);
} }
client.CheckViewerCaps();
m_log.DebugFormat("[LLUDPSERVER]: Client created, processing pending queue, {0} entries", queue.Count); m_log.DebugFormat("[LLUDPSERVER]: Client created, processing pending queue, {0} entries", queue.Count);
// Reinject queued packets // Reinject queued packets
while (queue.Count > 0) while (queue.Count > 0)
@ -1727,6 +1725,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// circuit code to the existing child agent. This is not particularly obvious. // circuit code to the existing child agent. This is not particularly obvious.
SendAckImmediate(endPoint, uccp.Header.Sequence); SendAckImmediate(endPoint, uccp.Header.Sequence);
client.CheckViewerCaps();
// We only want to send initial data to new clients, not ones which are being converted from child to root. // We only want to send initial data to new clients, not ones which are being converted from child to root.
if (client != null) if (client != null)
{ {

6
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2180,6 +2180,9 @@ namespace OpenSim.Region.Framework.Scenes
ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
//m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts)); //m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts));
// recheck to reduce timing issues
ControllingClient.CheckViewerCaps();
bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0; bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0;
int delayctnr = Util.EnvironmentTickCount(); int delayctnr = Util.EnvironmentTickCount();
@ -4040,6 +4043,9 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
// recheck to reduce timing issues
ControllingClient.CheckViewerCaps();
SendOtherAgentsAvatarFullToMe(); SendOtherAgentsAvatarFullToMe();
if(m_scene.ObjectsCullingByDistance) if(m_scene.ObjectsCullingByDistance)