diff options
author | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
commit | 7f5d0a6735585d47e081cb0b717de46d5e23260d (patch) | |
tree | d463176be6e07c4bb6948f428958fe7452866758 /OpenSim/Data/MySQL | |
parent | refactor out iar escaping (diff) | |
parent | remove the debug stuff (diff) | |
download | opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.zip opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.gz opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.bz2 opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 1fe6d29..6a4ccd7 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -151,10 +151,9 @@ namespace OpenSim.Data.MySQL | |||
151 | { | 151 | { |
152 | if (dbReader.Read()) | 152 | if (dbReader.Read()) |
153 | { | 153 | { |
154 | asset = new AssetBase(); | 154 | asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"]); |
155 | asset.Data = (byte[]) dbReader["data"]; | 155 | asset.Data = (byte[]) dbReader["data"]; |
156 | asset.Description = (string) dbReader["description"]; | 156 | asset.Description = (string) dbReader["description"]; |
157 | asset.FullID = assetID; | ||
158 | 157 | ||
159 | string local = dbReader["local"].ToString(); | 158 | string local = dbReader["local"].ToString(); |
160 | if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase)) | 159 | if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase)) |
@@ -162,8 +161,6 @@ namespace OpenSim.Data.MySQL | |||
162 | else | 161 | else |
163 | asset.Local = false; | 162 | asset.Local = false; |
164 | 163 | ||
165 | asset.Name = (string) dbReader["name"]; | ||
166 | asset.Type = (sbyte) dbReader["assetType"]; | ||
167 | asset.Temporary = Convert.ToBoolean(dbReader["temporary"]); | 164 | asset.Temporary = Convert.ToBoolean(dbReader["temporary"]); |
168 | } | 165 | } |
169 | dbReader.Close(); | 166 | dbReader.Close(); |