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

* Handle parcel telehub location corruption gracefully. DBNull 

* mySQL this time.
0.6.0-stable
Teravus Ovares 2008-06-20 18:46:43 +00:00
parent f8b1785467
commit 4448fd4b2f
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Data/MySQL/MySQLDataStore.cs
View File

@ -1025,13 +1025,22 @@ namespace OpenSim.Data.MySQL
newData.authBuyerID = authedbuyer; newData.authBuyerID = authedbuyer;
newData.snapshotID = snapshotID; newData.snapshotID = snapshotID;
try
{
newData.userLocation =
new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
Convert.ToSingle(row["UserLocationZ"]));
newData.userLookAt =
new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
Convert.ToSingle(row["UserLookAtZ"]));
}
catch (InvalidCastException)
{
newData.userLocation = LLVector3.Zero;
newData.userLookAt = LLVector3.Zero;
m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.landName);
}
newData.userLocation =
new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
Convert.ToSingle(row["UserLocationZ"]));
newData.userLookAt =
new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
Convert.ToSingle(row["UserLookAtZ"]));
newData.parcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); newData.parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
return newData; return newData;

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

@ -981,10 +981,11 @@ 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) catch (InvalidCastException)
{ {
m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.landName);
newData.userLocation = LLVector3.Zero; newData.userLocation = LLVector3.Zero;
newData.userLookAt = LLVector3.Zero; newData.userLookAt = LLVector3.Zero;
} }