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

Fully implement object return from the parcel dialog

Browse Source
This commit is contained in:
Melanie Thielker
2008-11-21 07:33:13 +00:00
parent 46278b34b1
commit ee4d4d784e
7 changed files with 114 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
View File

@@ -1149,10 +1149,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
if (selectedParcel == null) return;
if (returnType == 16) // parcel return
{
selectedParcel.returnLandObjects(returnType, agentIDs, remoteClient);
}
selectedParcel.returnLandObjects(returnType, agentIDs, taskIDs, remoteClient);
}
public void NoLandDataFromStorage()

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

@@ -776,28 +776,73 @@ namespace OpenSim.Region.Environment.Modules.World.Land
m_scene.returnObjects(objs, obj.OwnerID);
}
public void returnLandObjects(uint type, UUID[] owners, IClientAPI remote_client)
public void returnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client)
{
List<SceneObjectGroup> objlist = new List<SceneObjectGroup>();
for (int i = 0; i < owners.Length; i++)
Dictionary<UUID,List<SceneObjectGroup>> returns =
new Dictionary<UUID,List<SceneObjectGroup>>();
lock (primsOverMe)
{
lock (primsOverMe)
if (type == (uint)ObjectReturnType.Owner)
{
try
foreach (SceneObjectGroup obj in primsOverMe)
{
foreach (SceneObjectGroup obj in primsOverMe)
if (obj.OwnerID == m_landData.OwnerID)
{
if (obj.OwnerID == owners[i])
objlist.Add(obj);
if (!returns.ContainsKey(obj.OwnerID))
returns[obj.OwnerID] =
new List<SceneObjectGroup>();
returns[obj.OwnerID].Add(obj);
}
}
catch (InvalidOperationException)
}
else if (type == (uint)ObjectReturnType.Group && m_landData.GroupID != UUID.Zero)
{
foreach (SceneObjectGroup obj in primsOverMe)
{
m_log.Info("[PARCEL]: Unable to figure out all the objects owned by " + owners[i].ToString() + " arr.");
if (obj.GroupID == m_landData.GroupID)
{
if (!returns.ContainsKey(obj.OwnerID))
returns[obj.OwnerID] =
new List<SceneObjectGroup>();
returns[obj.OwnerID].Add(obj);
}
}
}
else if (type == (uint)ObjectReturnType.Other)
{
foreach (SceneObjectGroup obj in primsOverMe)
{
if (obj.OwnerID != m_landData.OwnerID &&
(obj.GroupID != m_landData.GroupID ||
m_landData.GroupID == UUID.Zero))
{
if (!returns.ContainsKey(obj.OwnerID))
returns[obj.OwnerID] =
new List<SceneObjectGroup>();
returns[obj.OwnerID].Add(obj);
}
}
}
else if (type == (uint)ObjectReturnType.List)
{
List<UUID> ownerlist = new List<UUID>(owners);
foreach (SceneObjectGroup obj in primsOverMe)
{
if (ownerlist.Contains(obj.OwnerID))
{
if (!returns.ContainsKey(obj.OwnerID))
returns[obj.OwnerID] =
new List<SceneObjectGroup>();
returns[obj.OwnerID].Add(obj);
}
}
}
}
m_scene.returnObjects(objlist.ToArray(), remote_client.AgentId);
foreach (List<SceneObjectGroup> ol in returns.Values)
m_scene.returnObjects(ol.ToArray(), remote_client.AgentId);
}
#endregion