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

Prevent bad prim in the database from crashing the sim, list affected 

ids and skip them.
avinationmerge
Melanie 2012-06-26 10:47:35 +02:00
parent ffc0badaf4
commit fcb34efa95
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@ -1268,6 +1268,8 @@ namespace OpenSim.Data.MySQL
/// <param name="row"></param> /// <param name="row"></param>
/// <returns></returns> /// <returns></returns>
private static TaskInventoryItem BuildItem(IDataReader row) private static TaskInventoryItem BuildItem(IDataReader row)
{
try
{ {
TaskInventoryItem taskItem = new TaskInventoryItem(); TaskInventoryItem taskItem = new TaskInventoryItem();
@ -1296,6 +1298,12 @@ namespace OpenSim.Data.MySQL
return taskItem; return taskItem;
} }
catch
{
m_log.ErrorFormat("[MYSQL DB]: Error reading task inventory: itemID was {0}, primID was {1}", row["itemID"].ToString(), row["primID"].ToString());
throw;
}
}
private static RegionSettings BuildRegionSettings(IDataReader row) private static RegionSettings BuildRegionSettings(IDataReader row)
{ {