aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs32
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs2
2 files changed, 18 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index ebada5a..f796ec9 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -357,19 +357,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
357 357
358 foreach (SceneObjectGroup objectGroup in objlist) 358 foreach (SceneObjectGroup objectGroup in objlist)
359 { 359 {
360 Vector3 inventoryStoredPosition = new Vector3 360// Vector3 inventoryStoredPosition = new Vector3
361 (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize) 361// (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
362 ? 250 362// ? 250
363 : objectGroup.AbsolutePosition.X) 363// : objectGroup.AbsolutePosition.X)
364 , 364// ,
365 (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize) 365// (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize)
366 ? 250 366// ? 250
367 : objectGroup.AbsolutePosition.Y, 367// : objectGroup.AbsolutePosition.Y,
368 objectGroup.AbsolutePosition.Z); 368// objectGroup.AbsolutePosition.Z);
369 369//
370 originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition; 370// originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
371 371//
372 objectGroup.AbsolutePosition = inventoryStoredPosition; 372// objectGroup.AbsolutePosition = inventoryStoredPosition;
373 373
374 // Make sure all bits but the ones we want are clear 374 // Make sure all bits but the ones we want are clear
375 // on take. 375 // on take.
@@ -397,9 +397,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
397 else 397 else
398 itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0], !asAttachment); 398 itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0], !asAttachment);
399 399
400 // Restore the position of each group now that it has been stored to inventory. 400// // Restore the position of each group now that it has been stored to inventory.
401 foreach (SceneObjectGroup objectGroup in objlist) 401// foreach (SceneObjectGroup objectGroup in objlist)
402 objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID]; 402// objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
403 403
404 InventoryItemBase item = CreateItemForObject(action, remoteClient, objlist[0], folderID); 404 InventoryItemBase item = CreateItemForObject(action, remoteClient, objlist[0], folderID);
405 405
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 79dd4a0..77299be 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1453,6 +1453,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1453 1453
1454 bool permission = false; 1454 bool permission = false;
1455 1455
1456 m_log.DebugFormat("[PERMISSIONS MODULE]: Checking rez object at {0} in {1}", objectPosition, m_scene.Name);
1457
1456 ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); 1458 ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
1457 if (land == null) return false; 1459 if (land == null) return false;
1458 1460