aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorMelanie2010-05-21 03:51:58 +0100
committerMelanie2010-05-21 03:51:58 +0100
commita92780fe5f31a38b2f00459ef00ca28127a60dcf (patch)
treef89850a27564abd01f1b3aaf72aa24001e165a26 /OpenSim/Client
parentRefactor scene presence list for lockless iteration. Lock contention will now... (diff)
parentCleaned up MySql migrations a bit more, got rid of all old-form migration fil... (diff)
downloadopensim-SC-a92780fe5f31a38b2f00459ef00ca28127a60dcf.zip
opensim-SC-a92780fe5f31a38b2f00459ef00ca28127a60dcf.tar.gz
opensim-SC-a92780fe5f31a38b2f00459ef00ca28127a60dcf.tar.bz2
opensim-SC-a92780fe5f31a38b2f00459ef00ca28127a60dcf.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs47
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs20
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs16
3 files changed, 27 insertions, 56 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 39923cb..6b169bd 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1038,23 +1038,6 @@ namespace OpenSim.Client.MXP.ClientStack
1038 // Need to translate to MXP somehow 1038 // Need to translate to MXP somehow
1039 } 1039 }
1040 1040
1041 public void SendAvatarData(SendAvatarData data)
1042 {
1043 //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID);
1044 UUID ownerID = data.AvatarID;
1045 MXPSendAvatarData(data.FirstName + " " + data.LastName, ownerID, UUID.Zero, data.AvatarID, data.AvatarLocalID, data.Position, data.Rotation);
1046 }
1047
1048 public void SendAvatarTerseUpdate(SendAvatarTerseData data)
1049 {
1050 MovementEventMessage me = new MovementEventMessage();
1051 me.ObjectIndex = data.LocalID;
1052 me.Location = ToOmVector(data.Position);
1053 me.Orientation = ToOmQuaternion(data.Rotation);
1054
1055 Session.Send(me);
1056 }
1057
1058 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) 1041 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
1059 { 1042 {
1060 // Minimap function, not used. 1043 // Minimap function, not used.
@@ -1070,23 +1053,31 @@ namespace OpenSim.Client.MXP.ClientStack
1070 // Need to translate to MXP somehow 1053 // Need to translate to MXP somehow
1071 } 1054 }
1072 1055
1073 public void SendPrimitiveToClient(SendPrimitiveData data) 1056 public void SendAvatarDataImmediate(ISceneEntity avatar)
1074 { 1057 {
1075 MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel, 1058 //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID);
1076 data.rotation, (uint)data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction, 1059 ScenePresence presence = (ScenePresence)avatar;
1077 data.material, data.textureanim); 1060 UUID ownerID = presence.UUID;
1061 MXPSendAvatarData(presence.Firstname + " " + presence.Lastname, ownerID, UUID.Zero, presence.UUID, presence.LocalId, presence.AbsolutePosition, presence.Rotation);
1078 } 1062 }
1079 1063
1080 public void SendPrimTerseUpdate(SendPrimitiveTerseData data) 1064 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
1081 { 1065 {
1082 MovementEventMessage me = new MovementEventMessage(); 1066 //MovementEventMessage me = new MovementEventMessage();
1083 me.ObjectIndex = data.LocalID; 1067 //me.ObjectIndex = data.LocalID;
1084 me.Location = ToOmVector(data.Position); 1068 //me.Location = ToOmVector(data.Position);
1085 me.Orientation = ToOmQuaternion(data.Rotation); 1069 //me.Orientation = ToOmQuaternion(data.Rotation);
1086 Session.Send(me); 1070
1071 //MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel,
1072 // data.rotation, (uint)data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction,
1073 // data.material, data.textureanim);
1074
1075 //Session.Send(me);
1076
1077 throw new System.NotImplementedException();
1087 } 1078 }
1088 1079
1089 public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler) 1080 public void ReprioritizeUpdates(UpdatePriorityHandler handler)
1090 { 1081 {
1091 } 1082 }
1092 1083
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 7c8a979..181606b 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -593,16 +593,6 @@ namespace OpenSim.Client.Sirikata.ClientStack
593 throw new System.NotImplementedException(); 593 throw new System.NotImplementedException();
594 } 594 }
595 595
596 public void SendAvatarData(SendAvatarData data)
597 {
598 throw new System.NotImplementedException();
599 }
600
601 public void SendAvatarTerseUpdate(SendAvatarTerseData data)
602 {
603 throw new System.NotImplementedException();
604 }
605
606 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) 596 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
607 { 597 {
608 throw new System.NotImplementedException(); 598 throw new System.NotImplementedException();
@@ -618,27 +608,27 @@ namespace OpenSim.Client.Sirikata.ClientStack
618 throw new System.NotImplementedException(); 608 throw new System.NotImplementedException();
619 } 609 }
620 610
621 public void SendPrimitiveToClient(SendPrimitiveData data) 611 public void SendAvatarDataImmediate(ISceneEntity avatar)
622 { 612 {
623 throw new System.NotImplementedException(); 613 throw new System.NotImplementedException();
624 } 614 }
625 615
626 public void SendPrimTerseUpdate(SendPrimitiveTerseData data) 616 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
627 { 617 {
628 throw new System.NotImplementedException(); 618 throw new System.NotImplementedException();
629 } 619 }
630 620
631 public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler) 621 public void ReprioritizeUpdates(UpdatePriorityHandler handler)
632 { 622 {
633 throw new System.NotImplementedException(); 623 throw new System.NotImplementedException();
634 } 624 }
635 625
636 public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems) 626 public void FlushPrimUpdates()
637 { 627 {
638 throw new System.NotImplementedException(); 628 throw new System.NotImplementedException();
639 } 629 }
640 630
641 public void FlushPrimUpdates() 631 public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems)
642 { 632 {
643 throw new System.NotImplementedException(); 633 throw new System.NotImplementedException();
644 } 634 }
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 5ad1643..febdd1b 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -599,16 +599,6 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
599 throw new System.NotImplementedException(); 599 throw new System.NotImplementedException();
600 } 600 }
601 601
602 public void SendAvatarData(SendAvatarData data)
603 {
604 throw new System.NotImplementedException();
605 }
606
607 public void SendAvatarTerseUpdate(SendAvatarTerseData data)
608 {
609 throw new System.NotImplementedException();
610 }
611
612 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) 602 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
613 { 603 {
614 throw new System.NotImplementedException(); 604 throw new System.NotImplementedException();
@@ -624,17 +614,17 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
624 throw new System.NotImplementedException(); 614 throw new System.NotImplementedException();
625 } 615 }
626 616
627 public void SendPrimitiveToClient(SendPrimitiveData data) 617 public void SendAvatarDataImmediate(ISceneEntity avatar)
628 { 618 {
629 throw new System.NotImplementedException(); 619 throw new System.NotImplementedException();
630 } 620 }
631 621
632 public void SendPrimTerseUpdate(SendPrimitiveTerseData data) 622 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
633 { 623 {
634 throw new System.NotImplementedException(); 624 throw new System.NotImplementedException();
635 } 625 }
636 626
637 public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler) 627 public void ReprioritizeUpdates(UpdatePriorityHandler handler)
638 { 628 {
639 throw new System.NotImplementedException(); 629 throw new System.NotImplementedException();
640 } 630 }