Merge branch 'master' into bulletsim

2 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 66fbcb9..b714f2b 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -810,18 +810,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         //
                         if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
                             remoteClient.SendBulkUpdateInventory(item);
+
                         return null;
                     }
 
-                    for (int i = 0 ; i < objlist.Count ; i++ )
+                    for (int i = 0 ; i < objlist.Count; i++)
                     {
                         group = objlist[i];
 
-                        Vector3 storedPosition = group.AbsolutePosition;
+//                        Vector3 storedPosition = group.AbsolutePosition;
                         if (group.UUID == UUID.Zero)
                         {
                             m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 3");
                         }
+
                         group.RootPart.FromFolderID = item.Folder;
 
                         // If it's rezzed in world, select it. Much easier to 
@@ -833,6 +835,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                             foreach (SceneObjectPart child in group.Parts)
                                 child.CreateSelected = true;
                         }
+
                         group.ResetIDs();
 
                         if (attachment)
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index f15f8f6..b5cbcbb 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
         {
             m_scene = scene;
 
-
             m_scene.AddCommand(this, "monitor report",
                                "monitor report",
                                "Returns a variety of statistics about the current region and/or simulator",