diff options
Diffstat (limited to 'OpenSim/Client/MXP/ClientStack')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 20 |
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 | ||