diff options
author | unknown | 2010-05-12 15:59:48 -0700 |
---|---|---|
committer | unknown | 2010-05-12 15:59:48 -0700 |
commit | bf5c81d77e492cd6df5517ecab32cd64168b01c2 (patch) | |
tree | ecbbfded19609dc8bcd39c0a8adea705c192fdb3 /OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |
parent | Removed the unreferenced MaxPrimsPerFrame from OpenSim.ini.example (diff) | |
download | opensim-SC-bf5c81d77e492cd6df5517ecab32cd64168b01c2.zip opensim-SC-bf5c81d77e492cd6df5517ecab32cd64168b01c2.tar.gz opensim-SC-bf5c81d77e492cd6df5517ecab32cd64168b01c2.tar.bz2 opensim-SC-bf5c81d77e492cd6df5517ecab32cd64168b01c2.tar.xz |
* Initial commit of the slimupdates2 rewrite. This pass maintains the original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
Diffstat (limited to 'OpenSim/Client/MXP/ClientStack/MXPClientView.cs')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 1d6d4c1..a62d897 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -1026,23 +1026,6 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1026 | // Need to translate to MXP somehow | 1026 | // Need to translate to MXP somehow |
1027 | } | 1027 | } |
1028 | 1028 | ||
1029 | public void SendAvatarData(SendAvatarData data) | ||
1030 | { | ||
1031 | //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID); | ||
1032 | UUID ownerID = data.AvatarID; | ||
1033 | MXPSendAvatarData(data.FirstName + " " + data.LastName, ownerID, UUID.Zero, data.AvatarID, data.AvatarLocalID, data.Position, data.Rotation); | ||
1034 | } | ||
1035 | |||
1036 | public void SendAvatarTerseUpdate(SendAvatarTerseData data) | ||
1037 | { | ||
1038 | MovementEventMessage me = new MovementEventMessage(); | ||
1039 | me.ObjectIndex = data.LocalID; | ||
1040 | me.Location = ToOmVector(data.Position); | ||
1041 | me.Orientation = ToOmQuaternion(data.Rotation); | ||
1042 | |||
1043 | Session.Send(me); | ||
1044 | } | ||
1045 | |||
1046 | public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) | 1029 | public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) |
1047 | { | 1030 | { |
1048 | // Minimap function, not used. | 1031 | // Minimap function, not used. |
@@ -1058,23 +1041,31 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1058 | // Need to translate to MXP somehow | 1041 | // Need to translate to MXP somehow |
1059 | } | 1042 | } |
1060 | 1043 | ||
1061 | public void SendPrimitiveToClient(SendPrimitiveData data) | 1044 | public void SendAvatarDataImmediate(ISceneEntity avatar) |
1062 | { | 1045 | { |
1063 | MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel, | 1046 | //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID); |
1064 | data.rotation, (uint)data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction, | 1047 | ScenePresence presence = (ScenePresence)avatar; |
1065 | data.material, data.textureanim); | 1048 | UUID ownerID = presence.UUID; |
1049 | MXPSendAvatarData(presence.Firstname + " " + presence.Lastname, ownerID, UUID.Zero, presence.UUID, presence.LocalId, presence.AbsolutePosition, presence.Rotation); | ||
1066 | } | 1050 | } |
1067 | 1051 | ||
1068 | public void SendPrimTerseUpdate(SendPrimitiveTerseData data) | 1052 | public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) |
1069 | { | 1053 | { |
1070 | MovementEventMessage me = new MovementEventMessage(); | 1054 | //MovementEventMessage me = new MovementEventMessage(); |
1071 | me.ObjectIndex = data.LocalID; | 1055 | //me.ObjectIndex = data.LocalID; |
1072 | me.Location = ToOmVector(data.Position); | 1056 | //me.Location = ToOmVector(data.Position); |
1073 | me.Orientation = ToOmQuaternion(data.Rotation); | 1057 | //me.Orientation = ToOmQuaternion(data.Rotation); |
1074 | Session.Send(me); | 1058 | |
1059 | //MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel, | ||
1060 | // data.rotation, (uint)data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction, | ||
1061 | // data.material, data.textureanim); | ||
1062 | |||
1063 | //Session.Send(me); | ||
1064 | |||
1065 | throw new System.NotImplementedException(); | ||
1075 | } | 1066 | } |
1076 | 1067 | ||
1077 | public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler) | 1068 | public void ReprioritizeUpdates(UpdatePriorityHandler handler) |
1078 | { | 1069 | { |
1079 | } | 1070 | } |
1080 | 1071 | ||