Still looking for that startup crash bug. Added some exception handling in prim object load.
parent
8fdeab57b1
commit
ef50e6875c
|
@ -215,6 +215,8 @@ namespace OpenSim.Framework.Data.MySQL
|
||||||
DataTable prims = m_primTable;
|
DataTable prims = m_primTable;
|
||||||
DataTable shapes = m_shapeTable;
|
DataTable shapes = m_shapeTable;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
string byRegion = "RegionUUID = '" + Util.ToRawUuidString(regionUUID) + "'";
|
string byRegion = "RegionUUID = '" + Util.ToRawUuidString(regionUUID) + "'";
|
||||||
string orderByParent = "ParentID ASC";
|
string orderByParent = "ParentID ASC";
|
||||||
|
|
||||||
|
@ -228,8 +230,8 @@ namespace OpenSim.Framework.Data.MySQL
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string uuid = (string) primRow["UUID"];
|
string uuid = (string)primRow["UUID"];
|
||||||
string objID = (string) primRow["SceneGroupID"];
|
string objID = (string)primRow["SceneGroupID"];
|
||||||
|
|
||||||
SceneObjectPart prim = buildPrim(primRow);
|
SceneObjectPart prim = buildPrim(primRow);
|
||||||
|
|
||||||
|
@ -286,6 +288,11 @@ namespace OpenSim.Framework.Data.MySQL
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MainLog.Instance.Error("DATASTORE", "Exception trying to load prim objects: " + ex.ToString());
|
||||||
|
}
|
||||||
return retvals;
|
return retvals;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue