diff options
author | mingchen | 2007-07-16 01:25:16 +0000 |
---|---|---|
committer | mingchen | 2007-07-16 01:25:16 +0000 |
commit | 7f10179129d4b5ac4ae5c05ff8598f569b8e6412 (patch) | |
tree | b5a6eac77699fd1857085aedcecf8732db7a0ebd /OpenSim/Framework/General | |
parent | Couple of small changes to NPC test character. (diff) | |
download | opensim-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/Framework/General/Interfaces/IClientAPI.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/ParcelData.cs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs index 4c6a0e0..bd258a3 100644 --- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs | |||
@@ -54,6 +54,7 @@ namespace OpenSim.Framework.Interfaces | |||
54 | 54 | ||
55 | public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); | 55 | public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); |
56 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); | 56 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); |
57 | public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient); | ||
57 | public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); | 58 | public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); |
58 | public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); | 59 | public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); |
59 | public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient); | 60 | public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient); |
@@ -71,7 +72,7 @@ namespace OpenSim.Framework.Interfaces | |||
71 | public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client); | 72 | public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client); |
72 | public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); | 73 | public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); |
73 | public delegate void ParcelSelectObjects(int parcel_local_id, int request_type, IClientAPI remote_client); | 74 | public delegate void ParcelSelectObjects(int parcel_local_id, int request_type, IClientAPI remote_client); |
74 | 75 | public delegate void ParcelObjectOwnerRequest(int local_id, IClientAPI remote_client); | |
75 | public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); | 76 | public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); |
76 | 77 | ||
77 | public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); | 78 | public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); |
@@ -106,6 +107,7 @@ namespace OpenSim.Framework.Interfaces | |||
106 | 107 | ||
107 | event UpdateShape OnUpdatePrimShape; | 108 | event UpdateShape OnUpdatePrimShape; |
108 | event ObjectSelect OnObjectSelect; | 109 | event ObjectSelect OnObjectSelect; |
110 | event ObjectDeselect OnObjectDeselect; | ||
109 | event GenericCall7 OnObjectDescription; | 111 | event GenericCall7 OnObjectDescription; |
110 | event GenericCall7 OnObjectName; | 112 | event GenericCall7 OnObjectName; |
111 | event UpdatePrimFlags OnUpdatePrimFlags; | 113 | event UpdatePrimFlags OnUpdatePrimFlags; |
@@ -128,7 +130,7 @@ namespace OpenSim.Framework.Interfaces | |||
128 | event ParcelJoinRequest OnParcelJoinRequest; | 130 | event ParcelJoinRequest OnParcelJoinRequest; |
129 | event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; | 131 | event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; |
130 | event ParcelSelectObjects OnParcelSelectObjects; | 132 | event ParcelSelectObjects OnParcelSelectObjects; |
131 | 133 | event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; | |
132 | event EstateOwnerMessageRequest OnEstateOwnerMessage; | 134 | event EstateOwnerMessageRequest OnEstateOwnerMessage; |
133 | 135 | ||
134 | LLVector3 StartPos | 136 | LLVector3 StartPos |
diff --git a/OpenSim/Framework/General/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs index 80b9b64..17de655 100644 --- a/OpenSim/Framework/General/Types/ParcelData.cs +++ b/OpenSim/Framework/General/Types/ParcelData.cs | |||
@@ -49,6 +49,7 @@ namespace OpenSim.Framework.Types | |||
49 | public int groupPrims = 0; | 49 | public int groupPrims = 0; |
50 | public int otherPrims = 0; | 50 | public int otherPrims = 0; |
51 | public int ownerPrims = 0; | 51 | public int ownerPrims = 0; |
52 | public int selectedPrims = 0; | ||
52 | public int simwidePrims = 0; | 53 | public int simwidePrims = 0; |
53 | public int simwideArea = 0; | 54 | public int simwideArea = 0; |
54 | public int salePrice = 0; //Unemeplemented. Parcels price. | 55 | public int salePrice = 0; //Unemeplemented. Parcels price. |
@@ -90,6 +91,7 @@ namespace OpenSim.Framework.Types | |||
90 | parcelData.groupPrims = this.groupPrims; | 91 | parcelData.groupPrims = this.groupPrims; |
91 | parcelData.otherPrims = this.otherPrims; | 92 | parcelData.otherPrims = this.otherPrims; |
92 | parcelData.ownerPrims = this.ownerPrims; | 93 | parcelData.ownerPrims = this.ownerPrims; |
94 | parcelData.selectedPrims = this.selectedPrims; | ||
93 | parcelData.isGroupOwned = this.isGroupOwned; | 95 | parcelData.isGroupOwned = this.isGroupOwned; |
94 | parcelData.localID = this.localID; | 96 | parcelData.localID = this.localID; |
95 | parcelData.landingType = this.landingType; | 97 | parcelData.landingType = this.landingType; |