aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs26
1 files changed, 10 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index fd82db7..0a39ded 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4963,8 +4963,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4963 // in that direction, even though we don't model this on the server. Implementing this in the future 4963 // in that direction, even though we don't model this on the server. Implementing this in the future
4964 // may improve movement smoothness. 4964 // may improve movement smoothness.
4965// acceleration = new Vector3(1, 0, 0); 4965// acceleration = new Vector3(1, 0, 0);
4966 4966
4967 angularVelocity = Vector3.Zero; 4967 angularVelocity = presence.AngularVelocity;
4968 rotation = presence.Rotation;
4968 4969
4969 if (sendTexture) 4970 if (sendTexture)
4970 textureEntry = presence.Appearance.Texture.GetBytes(); 4971 textureEntry = presence.Appearance.Texture.GetBytes();
@@ -6575,19 +6576,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6575 #endregion 6576 #endregion
6576 6577
6577 AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit; 6578 AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit;
6578 if (handlerAgentRequestSit != null)
6579 if (!(agentRequestSit.AgentData == null
6580 || agentRequestSit.TargetObject == null
6581 || agentRequestSit.TargetObject.TargetID == null
6582 || agentRequestSit.TargetObject.Offset == null))
6583 {
6584 var sp = m_scene.GetScenePresence(agentRequestSit.AgentData.AgentID);
6585 if (sp == null || sp.ParentID != 0) // ignore packet if agent is already sitting
6586 return true;
6587 6579
6588 handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID, 6580 if (handlerAgentRequestSit != null)
6589 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); 6581 handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
6590 } 6582 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
6591 } 6583 }
6592 return true; 6584 return true;
6593 } 6585 }
@@ -12242,11 +12234,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12242 if (logPacket) 12234 if (logPacket)
12243 m_log.DebugFormat( 12235 m_log.DebugFormat(
12244 "[CLIENT]: PACKET IN from {0} ({1}) in {2} - {3}", 12236 "[CLIENT]: PACKET IN from {0} ({1}) in {2} - {3}",
12245 Name, SceneAgent.IsChildAgent ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type); 12237 Name, SceneAgent.IsChildAgent ? "child" : "root ", Scene.Name, packet.Type);
12246 } 12238 }
12247 12239
12248 if (!ProcessPacketMethod(packet)) 12240 if (!ProcessPacketMethod(packet))
12249 m_log.Warn("[CLIENT]: unhandled packet " + packet.Type); 12241 m_log.WarnFormat(
12242 "[CLIENT]: Unhandled packet {0} from {1} ({2}) in {3}. Ignoring.",
12243 packet.Type, Name, SceneAgent.IsChildAgent ? "child" : "root ", Scene.Name);
12250 } 12244 }
12251 12245
12252 private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket) 12246 private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket)