diff options
author | AlexRa | 2010-05-19 02:28:19 +0300 |
---|---|---|
committer | AlexRa | 2010-05-19 02:28:19 +0300 |
commit | deae0301456a169540aafc4ff1a574e1304e327d (patch) | |
tree | 1091a4c044385b233fb9a9aafa29d42f1780cf33 /OpenSim/Data/MySQL/MySQLAssetData.cs | |
parent | All (?) MySQL stores fixed to use DBGuid.FromDB() (diff) | |
download | opensim-SC-deae0301456a169540aafc4ff1a574e1304e327d.zip opensim-SC-deae0301456a169540aafc4ff1a574e1304e327d.tar.gz opensim-SC-deae0301456a169540aafc4ff1a574e1304e327d.tar.bz2 opensim-SC-deae0301456a169540aafc4ff1a574e1304e327d.tar.xz |
Some more corrections after MySQL connector update
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 13f5fa2..ec18c28 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -33,6 +33,7 @@ using log4net; | |||
33 | using MySql.Data.MySqlClient; | 33 | using MySql.Data.MySqlClient; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Data; | ||
36 | 37 | ||
37 | namespace OpenSim.Data.MySQL | 38 | namespace OpenSim.Data.MySQL |
38 | { | 39 | { |
@@ -320,7 +321,7 @@ namespace OpenSim.Data.MySQL | |||
320 | metadata.Type = (sbyte)dbReader["assetType"]; | 321 | metadata.Type = (sbyte)dbReader["assetType"]; |
321 | metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct. | 322 | metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct. |
322 | metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]); | 323 | metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]); |
323 | metadata.FullID = new UUID((string)dbReader["id"]); | 324 | metadata.FullID = DBGuid.FromDB(dbReader["id"]); |
324 | 325 | ||
325 | // Current SHA1s are not stored/computed. | 326 | // Current SHA1s are not stored/computed. |
326 | metadata.SHA1 = new byte[] { }; | 327 | metadata.SHA1 = new byte[] { }; |