aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-30 08:01:47 +0000
committerTeravus Ovares2008-03-30 08:01:47 +0000
commitfd2caf5f1673ad14702d89db9804f841c5cb861a (patch)
tree18fd4ae03180b14df41f93544afa0cc9d5ec5309 /OpenSim/Region/ClientStack
parent* Stop the grid inventory service sending all folder and item details twice (diff)
downloadopensim-SC_OLD-fd2caf5f1673ad14702d89db9804f841c5cb861a.zip
opensim-SC_OLD-fd2caf5f1673ad14702d89db9804f841c5cb861a.tar.gz
opensim-SC_OLD-fd2caf5f1673ad14702d89db9804f841c5cb861a.tar.bz2
opensim-SC_OLD-fd2caf5f1673ad14702d89db9804f841c5cb861a.tar.xz
This update has good news and bad news, first the bad.
* This update breaks inter-region communications, sorry. * You will need to run prebuild. Next, the good; * This update solves the unexpected binary element when Linux simulators inform windows simulators and vice versa. So Linux Simulators and Windows simulators are 100% compatible again. * This update introduces an Integer in the prim crossing method to tell the receiving simulator which XML method to use to load the prim that crossed the border. If the receiving prim doesn't support the method, the prim crossing fails and no prims are lost. That being said, it's best to update all your simulators to this revision at once.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs21
1 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index a8762e4..10d052e 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -158,6 +158,7 @@ namespace OpenSim.Region.ClientStack
158 private UpdateShape handlerUpdatePrimShape = null; //null; 158 private UpdateShape handlerUpdatePrimShape = null; //null;
159 private ObjectExtraParams handlerUpdateExtraParams = null; //OnUpdateExtraParams; 159 private ObjectExtraParams handlerUpdateExtraParams = null; //OnUpdateExtraParams;
160 private ObjectDuplicate handlerObjectDuplicate = null; 160 private ObjectDuplicate handlerObjectDuplicate = null;
161 private ObjectDuplicateOnRay handlerObjectDuplicateOnRay = null;
161 private ObjectSelect handlerObjectSelect = null; 162 private ObjectSelect handlerObjectSelect = null;
162 private ObjectDeselect handlerObjectDeselect = null; 163 private ObjectDeselect handlerObjectDeselect = null;
163 private UpdatePrimFlags handlerUpdatePrimFlags = null; //OnUpdatePrimFlags; 164 private UpdatePrimFlags handlerUpdatePrimFlags = null; //OnUpdatePrimFlags;
@@ -675,6 +676,7 @@ namespace OpenSim.Region.ClientStack
675 public event UpdateVector OnGrabObject; 676 public event UpdateVector OnGrabObject;
676 public event ObjectSelect OnDeGrabObject; 677 public event ObjectSelect OnDeGrabObject;
677 public event ObjectDuplicate OnObjectDuplicate; 678 public event ObjectDuplicate OnObjectDuplicate;
679 public event ObjectDuplicateOnRay OnObjectDuplicateOnRay;
678 public event MoveObject OnGrabUpdate; 680 public event MoveObject OnGrabUpdate;
679 public event AddNewPrim OnAddPrim; 681 public event AddNewPrim OnAddPrim;
680 public event RequestGodlikePowers OnRequestGodlikePowers; 682 public event RequestGodlikePowers OnRequestGodlikePowers;
@@ -3590,7 +3592,26 @@ namespace OpenSim.Region.ClientStack
3590 // That means multiple object perms may be updated in a single packet. 3592 // That means multiple object perms may be updated in a single packet.
3591 3593
3592 break; 3594 break;
3595 case PacketType.ObjectDuplicateOnRay:
3596 ObjectDuplicateOnRayPacket dupeOnRay = (ObjectDuplicateOnRayPacket)Pack;
3593 3597
3598 handlerObjectDuplicateOnRay = null;
3599
3600
3601 for (int i = 0; i < dupeOnRay.ObjectData.Length; i++)
3602 {
3603 handlerObjectDuplicateOnRay = OnObjectDuplicateOnRay;
3604 if (handlerObjectDuplicateOnRay != null)
3605 {
3606 handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags,
3607 dupeOnRay.AgentData.AgentID, dupeOnRay.AgentData.GroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd,
3608 dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection,
3609 dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates);
3610 }
3611 }
3612
3613 break;
3614 break;
3594 case PacketType.RequestObjectPropertiesFamily: 3615 case PacketType.RequestObjectPropertiesFamily:
3595 //This powers the little tooltip that appears when you move your mouse over an object 3616 //This powers the little tooltip that appears when you move your mouse over an object
3596 RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack; 3617 RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack;