aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authormingchen2007-07-16 01:25:16 +0000
committermingchen2007-07-16 01:25:16 +0000
commit7f10179129d4b5ac4ae5c05ff8598f569b8e6412 (patch)
treeb5a6eac77699fd1857085aedcecf8732db7a0ebd /OpenSim/Region/ClientStack
parentCouple of small changes to NPC test character. (diff)
downloadopensim-SC_OLD-7f10179129d4b5ac4ae5c05ff8598f569b8e6412.zip
opensim-SC_OLD-7f10179129d4b5ac4ae5c05ff8598f569b8e6412.tar.gz
opensim-SC_OLD-7f10179129d4b5ac4ae5c05ff8598f569b8e6412.tar.bz2
opensim-SC_OLD-7f10179129d4b5ac4ae5c05ff8598f569b8e6412.tar.xz
*Fixed bug that incorrectly tabulated 'others' prims on a parcel
*Added support for selected prims (does not yet support prims being sat on) *Added support for listing avatars with prims on parcel with their prim count
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs3
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs18
2 files changed, 20 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index cf0e294..33e34c1 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -61,6 +61,7 @@ namespace OpenSim.Region.ClientStack
61 public event AddNewPrim OnAddPrim; 61 public event AddNewPrim OnAddPrim;
62 public event UpdateShape OnUpdatePrimShape; 62 public event UpdateShape OnUpdatePrimShape;
63 public event ObjectSelect OnObjectSelect; 63 public event ObjectSelect OnObjectSelect;
64 public event ObjectDeselect OnObjectDeselect;
64 public event GenericCall7 OnObjectDescription; 65 public event GenericCall7 OnObjectDescription;
65 public event GenericCall7 OnObjectName; 66 public event GenericCall7 OnObjectName;
66 public event UpdatePrimFlags OnUpdatePrimFlags; 67 public event UpdatePrimFlags OnUpdatePrimFlags;
@@ -85,7 +86,7 @@ namespace OpenSim.Region.ClientStack
85 public event ParcelJoinRequest OnParcelJoinRequest; 86 public event ParcelJoinRequest OnParcelJoinRequest;
86 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; 87 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
87 public event ParcelSelectObjects OnParcelSelectObjects; 88 public event ParcelSelectObjects OnParcelSelectObjects;
88 89 public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
89 public event EstateOwnerMessageRequest OnEstateOwnerMessage; 90 public event EstateOwnerMessageRequest OnEstateOwnerMessage;
90 91
91 /// <summary> 92 /// <summary>
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 37591d9..a8512a7 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -279,6 +279,16 @@ namespace OpenSim.Region.ClientStack
279 } 279 }
280 } 280 }
281 break; 281 break;
282 case PacketType.ObjectDeselect:
283 ObjectDeselectPacket incomingdeselect = (ObjectDeselectPacket)Pack;
284 for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)
285 {
286 if (OnObjectDeselect != null)
287 {
288 OnObjectDeselect(incomingdeselect.ObjectData[i].ObjectLocalID, this);
289 }
290 }
291 break;
282 case PacketType.ObjectFlagUpdate: 292 case PacketType.ObjectFlagUpdate:
283 ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack; 293 ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
284 if (OnUpdatePrimFlags != null) 294 if (OnUpdatePrimFlags != null)
@@ -601,6 +611,14 @@ namespace OpenSim.Region.ClientStack
601 OnParcelSelectObjects(selectPacket.ParcelData.LocalID, Convert.ToInt32(selectPacket.ParcelData.ReturnType), this); 611 OnParcelSelectObjects(selectPacket.ParcelData.LocalID, Convert.ToInt32(selectPacket.ParcelData.ReturnType), this);
602 } 612 }
603 break; 613 break;
614
615 case PacketType.ParcelObjectOwnersRequest:
616 ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack;
617 if (OnParcelObjectOwnerRequest != null)
618 {
619 OnParcelObjectOwnerRequest(reqPacket.ParcelData.LocalID, this);
620 }
621 break;
604 #endregion 622 #endregion
605 623
606 #region Estate Packets 624 #region Estate Packets