From 233e16b99cc80190d41143ecdfe01308eb39932a Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Sun, 18 Oct 2009 20:24:20 -0700
Subject: * Rewrote the methods that build ObjectUpdate and
 ImprovedTerseObjectUpdate packets to fill in the data more accurately and
 avoid allocating memory that is immediately thrown away * Changed the
 Send*Data structs in IClientAPI to use public readonly members instead of
 private members and getters * Made Parallel.ProcessorCount public * Started
 switching over packet building methods in LLClientView to use
 Util.StringToBytes[256/1024]() instead of Utils.StringToBytes() * More
 cleanup of the ScenePresences vs. ClientManager nightmare *
 ScenePresence.HandleAgentUpdate() will now time out and drop incoming
 AgentUpdate packets after three seconds. This fixes a deadlock on
 m_AgentUpdates that was blocking up the LLUDP server

---
 OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Client')

diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 52110d6..204603d 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -999,16 +999,16 @@ namespace OpenSim.Client.MXP.ClientStack
         public void SendAvatarData(SendAvatarData data)
         {
             //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID);
-            UUID ownerID = data.avatarID;
-            MXPSendAvatarData(data.firstName + " " + data.lastName, ownerID, UUID.Zero, data.avatarID, data.avatarLocalID, data.Pos, data.rotation);
+            UUID ownerID = data.AvatarID;
+            MXPSendAvatarData(data.FirstName + " " + data.LastName, ownerID, UUID.Zero, data.AvatarID, data.AvatarLocalID, data.Position, data.Rotation);
         }
 
         public void SendAvatarTerseUpdate(SendAvatarTerseData data)
         {
             MovementEventMessage me = new MovementEventMessage();
-            me.ObjectIndex = data.localID;
-            me.Location = ToOmVector(data.position);
-            me.Orientation = ToOmQuaternion(data.rotation);
+            me.ObjectIndex = data.LocalID;
+            me.Location = ToOmVector(data.Position);
+            me.Orientation = ToOmQuaternion(data.Rotation);
 
             Session.Send(me);
         }
@@ -1030,15 +1030,17 @@ namespace OpenSim.Client.MXP.ClientStack
 
         public void SendPrimitiveToClient(SendPrimitiveData data)
         {
-            MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel, data.rotation, data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction, data.material, data.textureanim);
+            MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel,
+                data.rotation, (uint)data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction,
+                data.material, data.textureanim);
         }
 
         public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
         {
             MovementEventMessage me = new MovementEventMessage();
-            me.ObjectIndex = data.localID;
-            me.Location = ToOmVector(data.position);
-            me.Orientation = ToOmQuaternion(data.rotation);
+            me.ObjectIndex = data.LocalID;
+            me.Location = ToOmVector(data.Position);
+            me.Orientation = ToOmQuaternion(data.Rotation);
             Session.Send(me);
         }
 
-- 
cgit v1.1