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

Attempt to track down the loading prims error. So Temporary fix to see if it is what we think.

afrisby
MW 2007-08-28 15:27:27 +00:00
parent 6bd4c6fee6
commit 1c503ad270
1 changed files with 20 additions and 1 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,6 +122,8 @@ 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"];
@ -168,8 +170,25 @@ 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;
} }
createdObjects[new LLUUID(objID)].AddPart(prim); 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"); MainLog.Instance.Verbose("DATASTORE", "Sqlite - LoadObjects found " + prims.Rows.Count + " primitives");