OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix prim returns I broke earlier

avinationmerge
Melanie Thielker 2010-06-01 03:04:49 +02:00
parent eca15cfbf2
commit 16d8602d3c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1637,11 +1637,14 @@ namespace OpenSim.Region.Framework.Scenes
null, null,
remoteClient.AgentId, remoteClient.AgentId,
deleteGroups)) deleteGroups))
{
permissionToTake = true;
permissionToDelete = true;
foreach (SceneObjectGroup g in deleteGroups) foreach (SceneObjectGroup g in deleteGroups)
{ {
AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return");
DeleteSceneObject(g, false); }
return;
} }
} }
else // Auto return passes through here with null agent else // Auto return passes through here with null agent

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -801,7 +801,7 @@ namespace OpenSim.Region.Framework.Scenes
maxZ = -256f; maxZ = -256f;
minX = 256f; minX = 256f;
minY = 256f; minY = 256f;
minZ = 256f; minZ = 8192f;
lockPartsForRead(true); lockPartsForRead(true);
{ {