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

Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

remotes/origin/0.6.7-post-fixes
Diva Canto 2009-08-22 09:04:25 -07:00
parent 75021b5309 173701dd63
commit 8ef758d826
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ namespace OpenSim.Data.MySQL
} }
asset.Name = (string) dbReader["name"]; asset.Name = (string) dbReader["name"];
asset.Type = (sbyte) dbReader["assetType"]; asset.Type = (sbyte) dbReader["assetType"];
asset.Temporary = (bool)dbReader["temporary"]; asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
} }
dbReader.Close(); dbReader.Close();
cmd.Dispose(); cmd.Dispose();
@ -359,7 +359,7 @@ namespace OpenSim.Data.MySQL
metadata.Name = (string) dbReader["name"]; metadata.Name = (string) dbReader["name"];
metadata.Description = (string) dbReader["description"]; metadata.Description = (string) dbReader["description"];
metadata.Type = (sbyte) dbReader["assetType"]; metadata.Type = (sbyte) dbReader["assetType"];
metadata.Temporary = (bool) dbReader["temporary"]; // Not sure if this is correct. metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
metadata.FullID = new UUID((string) dbReader["id"]); metadata.FullID = new UUID((string) dbReader["id"]);
// Current SHA1s are not stored/computed. // Current SHA1s are not stored/computed.