diff options
author | Teravus Ovares | 2008-05-24 11:10:21 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-24 11:10:21 +0000 |
commit | 375673ec903719f0225b182cb62aab153c86e04e (patch) | |
tree | 66ca3c7493119c47cc4488985f9535572a767e1c /OpenSim/Region/ClientStack/LindenUDP | |
parent | * Implements selected object return. (diff) | |
download | opensim-SC_OLD-375673ec903719f0225b182cb62aab153c86e04e.zip opensim-SC_OLD-375673ec903719f0225b182cb62aab153c86e04e.tar.gz opensim-SC_OLD-375673ec903719f0225b182cb62aab153c86e04e.tar.bz2 opensim-SC_OLD-375673ec903719f0225b182cb62aab153c86e04e.tar.xz |
This enables return from the parcel object owner display.
There's some oddness with the parcel counts, but if you can get past the oddness, you can return objects under an owner that you have permission to return.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ee2972f..9bef65f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -221,6 +221,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
221 | private ParcelSelectObjects handlerParcelSelectObjects = null; //OnParcelSelectObjects; | 221 | private ParcelSelectObjects handlerParcelSelectObjects = null; //OnParcelSelectObjects; |
222 | private ParcelObjectOwnerRequest handlerParcelObjectOwnerRequest = null; //OnParcelObjectOwnerRequest; | 222 | private ParcelObjectOwnerRequest handlerParcelObjectOwnerRequest = null; //OnParcelObjectOwnerRequest; |
223 | private ParcelAbandonRequest handlerParcelAbandonRequest = null; | 223 | private ParcelAbandonRequest handlerParcelAbandonRequest = null; |
224 | private ParcelReturnObjectsRequest handlerParcelReturnObjectsRequest = null; | ||
224 | private RegionInfoRequest handlerRegionInfoRequest = null; //OnRegionInfoRequest; | 225 | private RegionInfoRequest handlerRegionInfoRequest = null; //OnRegionInfoRequest; |
225 | private EstateCovenantRequest handlerEstateCovenantRequest = null; //OnEstateCovenantRequest; | 226 | private EstateCovenantRequest handlerEstateCovenantRequest = null; //OnEstateCovenantRequest; |
226 | private RequestGodlikePowers handlerReqGodlikePowers = null; //OnRequestGodlikePowers; | 227 | private RequestGodlikePowers handlerReqGodlikePowers = null; //OnRequestGodlikePowers; |
@@ -814,6 +815,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
814 | public event ParcelSelectObjects OnParcelSelectObjects; | 815 | public event ParcelSelectObjects OnParcelSelectObjects; |
815 | public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; | 816 | public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; |
816 | public event ParcelAbandonRequest OnParcelAbandonRequest; | 817 | public event ParcelAbandonRequest OnParcelAbandonRequest; |
818 | public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest; | ||
819 | |||
817 | public event RegionInfoRequest OnRegionInfoRequest; | 820 | public event RegionInfoRequest OnRegionInfoRequest; |
818 | public event EstateCovenantRequest OnEstateCovenantRequest; | 821 | public event EstateCovenantRequest OnEstateCovenantRequest; |
819 | 822 | ||
@@ -5419,6 +5422,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5419 | handlerParcelAbandonRequest(releasePacket.Data.LocalID, this); | 5422 | handlerParcelAbandonRequest(releasePacket.Data.LocalID, this); |
5420 | } | 5423 | } |
5421 | break; | 5424 | break; |
5425 | case PacketType.ParcelReturnObjects: | ||
5426 | |||
5427 | |||
5428 | ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; | ||
5429 | |||
5430 | LLUUID[] puserselectedOwnerIDs = new LLUUID[parcelReturnObjects.OwnerIDs.Length]; | ||
5431 | for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) | ||
5432 | puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; | ||
5433 | |||
5434 | LLUUID[] puserselectedTaskIDs = new LLUUID[parcelReturnObjects.TaskIDs.Length]; | ||
5435 | |||
5436 | for (int parceliterator = 0; parceliterator < parcelReturnObjects.TaskIDs.Length; parceliterator++) | ||
5437 | puserselectedTaskIDs[parceliterator] = parcelReturnObjects.TaskIDs[parceliterator].TaskID; | ||
5438 | |||
5439 | handlerParcelReturnObjectsRequest = OnParcelReturnObjectsRequest; | ||
5440 | if (handlerParcelReturnObjectsRequest != null) | ||
5441 | { | ||
5442 | handlerParcelReturnObjectsRequest(parcelReturnObjects.ParcelData.LocalID,parcelReturnObjects.ParcelData.ReturnType,puserselectedOwnerIDs,puserselectedTaskIDs, this); | ||
5443 | |||
5444 | } | ||
5445 | break; | ||
5446 | |||
5422 | #endregion | 5447 | #endregion |
5423 | 5448 | ||
5424 | #region Estate Packets | 5449 | #region Estate Packets |