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.
This commit is contained in:
Teravus Ovares
2008-05-24 11:10:21 +00:00
parent 3965fa2ff3
commit 375673ec90
11 changed files with 161 additions and 47 deletions

View File

@@ -902,7 +902,17 @@ namespace OpenSim.Region.Environment.Modules.World.Land
public void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client)
{
landList[local_id].sendLandObjectOwners(remote_client);
lock (landList)
{
if (landList.ContainsKey(local_id))
{
landList[local_id].sendLandObjectOwners(remote_client);
}
else
{
System.Console.WriteLine("[PARCEL]: Invalid land object passed for parcel object owner request");
}
}
}
public void handleParcelAbandonRequest(int local_id, IClientAPI remote_client)
@@ -1004,6 +1014,24 @@ namespace OpenSim.Region.Environment.Modules.World.Land
AddLandObject(new_land);
}
public void ReturnObjectsInParcel(int localID, uint returnType, LLUUID[] agentIDs, LLUUID[] taskIDs, IClientAPI remoteClient)
{
ILandObject selectedParcel = null;
lock (landList)
{
if (landList.ContainsKey(localID))
selectedParcel = landList[localID];
}
if (selectedParcel == null)
return;
if (returnType == 16) // parcel return
{
selectedParcel.returnLandObjects(returnType, agentIDs, remoteClient);
}
}
public void NoLandDataFromStorage()
{
ResetSimLandObjects();