Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge

2 files changed, 9 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 12688bd..218f2c5 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (SceneObjectGroup g in objectGroups)
                 {
                     killIDs.Add(g.LocalId);
-                    g.DeleteGroupFromScene(false);
+                    g.DeleteGroupFromScene(true);
                 }
 
                 m_scene.SendKillObject(killIDs);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 07e303f..309f543 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1122,14 +1122,19 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="datastore"></param>
         public void ProcessInventoryBackup(ISimulationDataService datastore)
         {
-            if (HasInventoryChanged)
-            {
+// Removed this because linking will cause an immediate delete of the new
+// child prim from the database and the subsequent storing of the prim sees
+// the inventory of it as unchanged and doesn't store it at all. The overhead
+// of storing prim inventory needlessly is much less than the aggravation
+// of prim inventory loss.
+//            if (HasInventoryChanged)
+//            {
                 Items.LockItemsForRead(true);
                 datastore.StorePrimInventory(m_part.UUID, Items.Values);
                 Items.LockItemsForRead(false);
 
                 HasInventoryChanged = false;
-            }
+//            }
         }
 
         public class InventoryStringBuilder