diff options
| author | Diva Canto | 2009-08-22 09:04:25 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-22 09:04:25 -0700 |
| commit | 8ef758d8264bb597a0180efe6e46aae543c57a99 (patch) | |
| tree | d273975874631e53088f174d5a184b763f1222e7 /OpenSim | |
| parent | Moved AuthedSessionCache to where it is used -- Grid/InventoryServer. (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-8ef758d8264bb597a0180efe6e46aae543c57a99.zip opensim-SC-8ef758d8264bb597a0180efe6e46aae543c57a99.tar.gz opensim-SC-8ef758d8264bb597a0180efe6e46aae543c57a99.tar.bz2 opensim-SC-8ef758d8264bb597a0180efe6e46aae543c57a99.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 1b4377a..66c34fe 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
| @@ -168,7 +168,7 @@ namespace OpenSim.Data.MySQL | |||
| 168 | } | 168 | } |
| 169 | asset.Name = (string) dbReader["name"]; | 169 | asset.Name = (string) dbReader["name"]; |
| 170 | asset.Type = (sbyte) dbReader["assetType"]; | 170 | asset.Type = (sbyte) dbReader["assetType"]; |
| 171 | asset.Temporary = (bool)dbReader["temporary"]; | 171 | asset.Temporary = Convert.ToBoolean(dbReader["temporary"]); |
| 172 | } | 172 | } |
| 173 | dbReader.Close(); | 173 | dbReader.Close(); |
| 174 | cmd.Dispose(); | 174 | cmd.Dispose(); |
| @@ -359,7 +359,7 @@ namespace OpenSim.Data.MySQL | |||
| 359 | metadata.Name = (string) dbReader["name"]; | 359 | metadata.Name = (string) dbReader["name"]; |
| 360 | metadata.Description = (string) dbReader["description"]; | 360 | metadata.Description = (string) dbReader["description"]; |
| 361 | metadata.Type = (sbyte) dbReader["assetType"]; | 361 | metadata.Type = (sbyte) dbReader["assetType"]; |
| 362 | metadata.Temporary = (bool) dbReader["temporary"]; // Not sure if this is correct. | 362 | metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct. |
| 363 | metadata.FullID = new UUID((string) dbReader["id"]); | 363 | metadata.FullID = new UUID((string) dbReader["id"]); |
| 364 | 364 | ||
| 365 | // Current SHA1s are not stored/computed. | 365 | // Current SHA1s are not stored/computed. |