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

Removed last commit, as sdague has also done a fix.

afrisby
MW 2007-08-28 15:29:37 +00:00
parent 1c503ad270
commit 9a09b7532d
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
View File

@ -122,8 +122,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
{ {
Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>(); Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>();
Dictionary<LLUUID, SceneObjectPart> loadedParentlessParts = new Dictionary<LLUUID, SceneObjectPart>();
List<SceneObjectGroup> retvals = new List<SceneObjectGroup>(); List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
DataTable prims = ds.Tables["prims"]; 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"); Console.WriteLine("No shape found for prim in storage, so setting default box shape");
prim.Shape = BoxShape.Default; prim.Shape = BoxShape.Default;
} }
if (createdObjects.ContainsKey(new LLUUID(objID)))
{
createdObjects[new LLUUID(objID)].AddPart(prim); 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"); MainLog.Instance.Verbose("DATASTORE", "Sqlite - LoadObjects found " + prims.Rows.Count + " primitives");