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

Applied Mysql exception fix from Trunk revision 8073 to 0.6.2 post stable branch

0.6.2-post-fixes
MW 2009-03-17 11:13:40 +00:00
parent 1dccfacbe0
commit cfe0a449b4
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Data/MySQL/MySQLAssetData.cs
View File

@ -142,7 +142,16 @@ namespace OpenSim.Data.MySQL
asset.Data = (byte[]) dbReader["data"]; asset.Data = (byte[]) dbReader["data"];
asset.Description = (string) dbReader["description"]; asset.Description = (string) dbReader["description"];
asset.FullID = assetID; asset.FullID = assetID;
asset.Local = (bool)dbReader["local"];
try
{
asset.Local = (bool)dbReader["local"];
}
catch (System.InvalidCastException)
{
asset.Local = false;
}
asset.Name = (string) dbReader["name"]; asset.Name = (string) dbReader["name"];
asset.Type = (sbyte) dbReader["assetType"]; asset.Type = (sbyte) dbReader["assetType"];
} }

2
OpenSim/Region/Application/HGOpenSimNode.cs
View File

@ -215,7 +215,7 @@ namespace OpenSim
} }
private void LoadXmlLinkFile(string[] cmdparams) public void LoadXmlLinkFile(string[] cmdparams)
{ {
try try
{ {