mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 00:46:02 +08:00
Removed last commit, as sdague has also done a fix.
This commit is contained in:
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user