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

* Handle parcel telehub location corruption gracefully. DBNull

0.6.0-stable
Teravus Ovares 2008-06-20 17:07:01 +00:00
parent 9cde1c4b82
commit f8b1785467
1 changed files with 15 additions and 6 deletions
OpenSim/Data/SQLite

9
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -972,6 +972,8 @@ namespace OpenSim.Data.SQLite
newData.passHours = Convert.ToSingle(row["PassHours"]); newData.passHours = Convert.ToSingle(row["PassHours"]);
newData.passPrice = Convert.ToInt32(row["PassPrice"]); newData.passPrice = Convert.ToInt32(row["PassPrice"]);
newData.snapshotID = (String) row["SnapshotUUID"]; newData.snapshotID = (String) row["SnapshotUUID"];
try
{
newData.userLocation = newData.userLocation =
new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
@ -979,6 +981,13 @@ namespace OpenSim.Data.SQLite
newData.userLookAt = newData.userLookAt =
new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]), new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
Convert.ToSingle(row["UserLookAtZ"])); Convert.ToSingle(row["UserLookAtZ"]));
m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.landName);
}
catch (InvalidCastException)
{
newData.userLocation = LLVector3.Zero;
newData.userLookAt = LLVector3.Zero;
}
newData.parcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); newData.parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
LLUUID authBuyerID = LLUUID.Zero; LLUUID authBuyerID = LLUUID.Zero;