aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP/ClientStack
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-18 20:24:20 -0700
committerJohn Hurliman2009-10-18 20:24:20 -0700
commit233e16b99cc80190d41143ecdfe01308eb39932a (patch)
tree340a75427ec8fc9082a0f543021dbfebacdb3033 /OpenSim/Client/MXP/ClientStack
parent* Process the avatar terse update priority queue as soon as an update for our... (diff)
downloadopensim-SC_OLD-233e16b99cc80190d41143ecdfe01308eb39932a.zip
opensim-SC_OLD-233e16b99cc80190d41143ecdfe01308eb39932a.tar.gz
opensim-SC_OLD-233e16b99cc80190d41143ecdfe01308eb39932a.tar.bz2
opensim-SC_OLD-233e16b99cc80190d41143ecdfe01308eb39932a.tar.xz
* 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
Diffstat (limited to 'OpenSim/Client/MXP/ClientStack')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs20
1 files changed, 11 insertions, 9 deletions
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
999 public void SendAvatarData(SendAvatarData data) 999 public void SendAvatarData(SendAvatarData data)
1000 { 1000 {
1001 //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID); 1001 //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID);
1002 UUID ownerID = data.avatarID; 1002 UUID ownerID = data.AvatarID;
1003 MXPSendAvatarData(data.firstName + " " + data.lastName, ownerID, UUID.Zero, data.avatarID, data.avatarLocalID, data.Pos, data.rotation); 1003 MXPSendAvatarData(data.FirstName + " " + data.LastName, ownerID, UUID.Zero, data.AvatarID, data.AvatarLocalID, data.Position, data.Rotation);
1004 } 1004 }
1005 1005
1006 public void SendAvatarTerseUpdate(SendAvatarTerseData data) 1006 public void SendAvatarTerseUpdate(SendAvatarTerseData data)
1007 { 1007 {
1008 MovementEventMessage me = new MovementEventMessage(); 1008 MovementEventMessage me = new MovementEventMessage();
1009 me.ObjectIndex = data.localID; 1009 me.ObjectIndex = data.LocalID;
1010 me.Location = ToOmVector(data.position); 1010 me.Location = ToOmVector(data.Position);
1011 me.Orientation = ToOmQuaternion(data.rotation); 1011 me.Orientation = ToOmQuaternion(data.Rotation);
1012 1012
1013 Session.Send(me); 1013 Session.Send(me);
1014 } 1014 }
@@ -1030,15 +1030,17 @@ namespace OpenSim.Client.MXP.ClientStack
1030 1030
1031 public void SendPrimitiveToClient(SendPrimitiveData data) 1031 public void SendPrimitiveToClient(SendPrimitiveData data)
1032 { 1032 {
1033 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); 1033 MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel,
1034 data.rotation, (uint)data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction,
1035 data.material, data.textureanim);
1034 } 1036 }
1035 1037
1036 public void SendPrimTerseUpdate(SendPrimitiveTerseData data) 1038 public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
1037 { 1039 {
1038 MovementEventMessage me = new MovementEventMessage(); 1040 MovementEventMessage me = new MovementEventMessage();
1039 me.ObjectIndex = data.localID; 1041 me.ObjectIndex = data.LocalID;
1040 me.Location = ToOmVector(data.position); 1042 me.Location = ToOmVector(data.Position);
1041 me.Orientation = ToOmQuaternion(data.rotation); 1043 me.Orientation = ToOmQuaternion(data.Rotation);
1042 Session.Send(me); 1044 Session.Send(me);
1043 } 1045 }
1044 1046