aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs8
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs15
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
3 files changed, 19 insertions, 6 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 258b3eb..29a69c3 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1074,7 +1074,15 @@ namespace OpenSim.Framework
1074 void SendWindData(Vector2[] windSpeeds); 1074 void SendWindData(Vector2[] windSpeeds);
1075 void SendCloudData(float[] cloudCover); 1075 void SendCloudData(float[] cloudCover);
1076 1076
1077 /// <summary>
1078 /// Sent when an agent completes its movement into a region.
1079 /// </summary>
1080 /// <remarks>
1081 /// This packet marks completion of the arrival of a root avatar in a region, whether through login, region
1082 /// crossing or direct teleport.
1083 /// </remarks>
1077 void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look); 1084 void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
1085
1078 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint); 1086 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
1079 1087
1080 /// <summary> 1088 /// <summary>
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1e72aa2..2553b3a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -762,9 +762,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
762 OutPacket(handshake, ThrottleOutPacketType.Task); 762 OutPacket(handshake, ThrottleOutPacketType.Task);
763 } 763 }
764 764
765 /// <summary>
766 ///
767 /// </summary>
768 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) 765 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
769 { 766 {
770 AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete); 767 AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
@@ -3480,6 +3477,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3480 3477
3481 public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) 3478 public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
3482 { 3479 {
3480 m_log.DebugFormat(
3481 "[LLCLIENTVIEW]: Sending avatar appearance for {0} with {1} bytes to {2} {3}",
3482 agentID, textureEntry.Length, Name, AgentId);
3483
3483 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); 3484 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
3484 // TODO: don't create new blocks if recycling an old packet 3485 // TODO: don't create new blocks if recycling an old packet
3485 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; 3486 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
@@ -3501,7 +3502,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3501 3502
3502 public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs) 3503 public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
3503 { 3504 {
3504 //m_log.DebugFormat("[CLIENT]: Sending animations to {0}", Name); 3505// m_log.DebugFormat("[LLCLIENTVIEW]: Sending animations for {0} to {1}", sourceAgentId, Name);
3505 3506
3506 AvatarAnimationPacket ani = (AvatarAnimationPacket)PacketPool.Instance.GetPacket(PacketType.AvatarAnimation); 3507 AvatarAnimationPacket ani = (AvatarAnimationPacket)PacketPool.Instance.GetPacket(PacketType.AvatarAnimation);
3507 // TODO: don't create new blocks if recycling an old packet 3508 // TODO: don't create new blocks if recycling an old packet
@@ -3536,6 +3537,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3536 /// </summary> 3537 /// </summary>
3537 public void SendAvatarDataImmediate(ISceneEntity avatar) 3538 public void SendAvatarDataImmediate(ISceneEntity avatar)
3538 { 3539 {
3540 m_log.DebugFormat(
3541 "[LLCLIENTVIEW]: Sending immediate object update for avatar {0} {1} to {2} {3}",
3542 avatar.Name, avatar.UUID, Name, AgentId);
3543
3539 ScenePresence presence = avatar as ScenePresence; 3544 ScenePresence presence = avatar as ScenePresence;
3540 if (presence == null) 3545 if (presence == null)
3541 return; 3546 return;
@@ -3545,7 +3550,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3545 3550
3546 objupdate.RegionData.RegionHandle = presence.RegionHandle; 3551 objupdate.RegionData.RegionHandle = presence.RegionHandle;
3547 objupdate.RegionData.TimeDilation = ushort.MaxValue; 3552 objupdate.RegionData.TimeDilation = ushort.MaxValue;
3548 3553
3549 objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; 3554 objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
3550 objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence); 3555 objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence);
3551 3556
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3c9bde8..230cf91 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1212,7 +1212,7 @@ namespace OpenSim.Region.Framework.Scenes
1212 m_callbackURI = null; 1212 m_callbackURI = null;
1213 } 1213 }
1214 1214
1215 //m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); 1215 m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
1216 1216
1217 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); 1217 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
1218 ValidateAndSendAppearanceAndAgentData(); 1218 ValidateAndSendAppearanceAndAgentData();