Applied Mysql exception fix from Trunk revision 8073 to 0.6.2 post stable branch
parent
1dccfacbe0
commit
cfe0a449b4
|
@ -142,7 +142,16 @@ namespace OpenSim.Data.MySQL
|
|||
asset.Data = (byte[]) dbReader["data"];
|
||||
asset.Description = (string) dbReader["description"];
|
||||
asset.FullID = assetID;
|
||||
|
||||
try
|
||||
{
|
||||
asset.Local = (bool)dbReader["local"];
|
||||
}
|
||||
catch (System.InvalidCastException)
|
||||
{
|
||||
asset.Local = false;
|
||||
}
|
||||
|
||||
asset.Name = (string) dbReader["name"];
|
||||
asset.Type = (sbyte) dbReader["assetType"];
|
||||
}
|
||||
|
|
|
@ -215,7 +215,7 @@ namespace OpenSim
|
|||
|
||||
}
|
||||
|
||||
private void LoadXmlLinkFile(string[] cmdparams)
|
||||
public void LoadXmlLinkFile(string[] cmdparams)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue