try another way

0.9.1.0-post-fixes
UbitUmarov 2019-03-27 07:32:06 +00:00
parent dad533fe1c
commit 5663e2c0c8
3 changed files with 6 additions and 2 deletions

View File

@ -12700,6 +12700,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
{ {
/*
UseCircuitCodePacket uccp = (UseCircuitCodePacket)Pack; UseCircuitCodePacket uccp = (UseCircuitCodePacket)Pack;
if(uccp.CircuitCode.ID == m_agentId && if(uccp.CircuitCode.ID == m_agentId &&
uccp.CircuitCode.SessionID == m_sessionId && uccp.CircuitCode.SessionID == m_sessionId &&
@ -12708,8 +12709,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
!((ScenePresence)SceneAgent).IsDeleted !((ScenePresence)SceneAgent).IsDeleted
) )
SendRegionHandshake(); // possible someone returning SendRegionHandshake(); // possible someone returning
*/
return true; return true;
} }
private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack) private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)

View File

@ -1725,6 +1725,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (client != null) if (client != null)
{ {
if(aCircuit.teleportFlags <= 0)
client.SendRegionHandshake(); client.SendRegionHandshake();
client.CheckViewerCaps(); client.CheckViewerCaps();
} }

View File

@ -2179,6 +2179,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
// Tell the client that we're totally ready // Tell the client that we're totally ready
ControllingClient.SendRegionHandshake();
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));