From 9a09b7532d559c08cbfb7d27872eab343d35b4f1 Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 28 Aug 2007 15:29:37 +0000
Subject: Removed last commit, as sdague has also done a fix.

---
 .../MonoSqliteDataStore.cs                          | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite')

diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index 0eb8412..1882c55 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -122,8 +122,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
         public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
         {
             Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>();
-            Dictionary<LLUUID, SceneObjectPart> loadedParentlessParts = new Dictionary<LLUUID, SceneObjectPart>();
-
+           
             List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
 
             DataTable prims = ds.Tables["prims"];
@@ -170,25 +169,11 @@ namespace OpenSim.DataStore.MonoSqliteStorage
                         Console.WriteLine("No shape found for prim in storage, so setting default box shape");
                         prim.Shape = BoxShape.Default;
                     }
-                    if (createdObjects.ContainsKey(new LLUUID(objID)))
-                    {
+
                         createdObjects[new LLUUID(objID)].AddPart(prim);
-                    }
-                    else
-                    {
-                        loadedParentlessParts.Add(new LLUUID(objID), prim);
-                    }
-                }
 
-                foreach (KeyValuePair<LLUUID, SceneObjectPart> kvp in loadedParentlessParts)
-                {
-                    if (createdObjects.ContainsKey(kvp.Key))
-                    {
-                        createdObjects[kvp.Key].AddPart(kvp.Value);
-                    }
+                  
                 }
-
-                loadedParentlessParts.Clear();
             }
 
             MainLog.Instance.Verbose("DATASTORE", "Sqlite - LoadObjects found " + prims.Rows.Count + " primitives");
-- 
cgit v1.1