ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

This enables return from the parcel object owner display.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
View File

@@ -142,6 +142,13 @@ namespace OpenSim.Region.Environment.Modules.World.Land
m_landManagementModule.UpdateLandObject(localID, data);
}
}
public void ReturnObjectsInParcel(int localID, uint returnType, LLUUID[] agentIDs, LLUUID[] taskIDs, IClientAPI remoteClient)
{
if (m_landManagementModule != null)
{
m_landManagementModule.ReturnObjectsInParcel(localID, returnType, agentIDs, taskIDs, remoteClient);
}
}
#endregion
}

30
OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
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();

86
OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
View File

@@ -683,13 +683,25 @@ namespace OpenSim.Region.Environment.Modules.World.Land
public Dictionary<LLUUID, int> getLandObjectOwners()
{
Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>();
foreach (SceneObjectGroup obj in primsOverMe)
lock (primsOverMe)
{
if (!ownersAndCount.ContainsKey(obj.OwnerID))
try
{
ownersAndCount.Add(obj.OwnerID, 0);
foreach (SceneObjectGroup obj in primsOverMe)
{
if (!ownersAndCount.ContainsKey(obj.OwnerID))
{
ownersAndCount.Add(obj.OwnerID, 0);
}
ownersAndCount[obj.OwnerID] += obj.PrimCount;
}
}
ownersAndCount[obj.OwnerID] += obj.PrimCount;
catch (InvalidOperationException)
{
m_log.Error("[LAND]: Unable to enumerate land owners. arr.");
}
}
return ownersAndCount;
}
@@ -700,10 +712,33 @@ namespace OpenSim.Region.Environment.Modules.World.Land
public void returnObject(SceneObjectGroup obj)
{
SceneObjectGroup[] objs = new SceneObjectGroup[1];
objs[0] = obj;
m_scene.returnObjects(objs, obj.OwnerID);
}
public void returnLandObjects(int type, LLUUID owner)
public void returnLandObjects(uint type, LLUUID[] owners, IClientAPI remote_client)
{
List<SceneObjectGroup> objlist = new List<SceneObjectGroup>();
for (int i = 0; i < owners.Length; i++)
{
lock (primsOverMe)
{
try
{
foreach (SceneObjectGroup obj in primsOverMe)
{
if (obj.OwnerID == owners[i])
objlist.Add(obj);
}
}
catch (InvalidOperationException)
{
m_log.Info("[PARCEL]: Unable to figure out all the objects owned by " + owners[i].ToString() + " arr.");
}
}
}
m_scene.returnObjects(objlist.ToArray(), remote_client.AgentId);
}
#endregion
@@ -716,7 +751,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
landData.ownerPrims = 0;
landData.otherPrims = 0;
landData.selectedPrims = 0;
primsOverMe.Clear();
lock (primsOverMe)
primsOverMe.Clear();
}
public void addPrimToCount(SceneObjectGroup obj)
@@ -740,30 +776,34 @@ namespace OpenSim.Region.Environment.Modules.World.Land
}
}
primsOverMe.Add(obj);
lock (primsOverMe)
primsOverMe.Add(obj);
}
public void removePrimFromCount(SceneObjectGroup obj)
{
if (primsOverMe.Contains(obj))
lock (primsOverMe)
{
LLUUID prim_owner = obj.OwnerID;
int prim_count = obj.PrimCount;
if (primsOverMe.Contains(obj))
{
LLUUID prim_owner = obj.OwnerID;
int prim_count = obj.PrimCount;
if (prim_owner == landData.ownerID)
{
landData.ownerPrims -= prim_count;
}
else if (prim_owner == landData.groupID)
{
landData.groupPrims -= prim_count;
}
else
{
landData.otherPrims -= prim_count;
}
if (prim_owner == landData.ownerID)
{
landData.ownerPrims -= prim_count;
}
else if (prim_owner == landData.groupID)
{
landData.groupPrims -= prim_count;
}
else
{
landData.otherPrims -= prim_count;
}
primsOverMe.Remove(obj);
primsOverMe.Remove(obj);
}
}
}

1
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@@ -243,6 +243,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
public event ParcelJoinRequest OnParcelJoinRequest;
public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
public event ParcelAbandonRequest OnParcelAbandonRequest;
public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
public event ParcelAccessListRequest OnParcelAccessListRequest;
public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
public event ParcelSelectObjects OnParcelSelectObjects;