diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 49275cb..23642b3 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -162,22 +162,22 @@ namespace OpenSim.Data.SQLite | |||
162 | } | 162 | } |
163 | } | 163 | } |
164 | 164 | ||
165 | /// <summary> | 165 | // /// <summary> |
166 | /// Some... logging functionnality | 166 | // /// Some... logging functionnality |
167 | /// </summary> | 167 | // /// </summary> |
168 | /// <param name="asset"></param> | 168 | // /// <param name="asset"></param> |
169 | private static void LogAssetLoad(AssetBase asset) | 169 | // private static void LogAssetLoad(AssetBase asset) |
170 | { | 170 | // { |
171 | string temporary = asset.Temporary ? "Temporary" : "Stored"; | 171 | // string temporary = asset.Temporary ? "Temporary" : "Stored"; |
172 | string local = asset.Local ? "Local" : "Remote"; | 172 | // string local = asset.Local ? "Local" : "Remote"; |
173 | 173 | // | |
174 | int assetLength = (asset.Data != null) ? asset.Data.Length : 0; | 174 | // int assetLength = (asset.Data != null) ? asset.Data.Length : 0; |
175 | 175 | // | |
176 | m_log.Debug("[ASSET DB]: " + | 176 | // m_log.Debug("[ASSET DB]: " + |
177 | string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)", | 177 | // string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)", |
178 | asset.FullID, asset.Name, asset.Description, asset.Type, | 178 | // asset.FullID, asset.Name, asset.Description, asset.Type, |
179 | temporary, local, assetLength)); | 179 | // temporary, local, assetLength)); |
180 | } | 180 | // } |
181 | 181 | ||
182 | /// <summary> | 182 | /// <summary> |
183 | /// Check if an asset exist in database | 183 | /// Check if an asset exist in database |
@@ -231,12 +231,13 @@ namespace OpenSim.Data.SQLite | |||
231 | // TODO: this doesn't work yet because something more | 231 | // TODO: this doesn't work yet because something more |
232 | // interesting has to be done to actually get these values | 232 | // interesting has to be done to actually get these values |
233 | // back out. Not enough time to figure it out yet. | 233 | // back out. Not enough time to figure it out yet. |
234 | AssetBase asset = new AssetBase(); | 234 | AssetBase asset = new AssetBase( |
235 | new UUID((String)row["UUID"]), | ||
236 | (String)row["Name"], | ||
237 | Convert.ToSByte(row["Type"]) | ||
238 | ); | ||
235 | 239 | ||
236 | asset.FullID = new UUID((String) row["UUID"]); | ||
237 | asset.Name = (String) row["Name"]; | ||
238 | asset.Description = (String) row["Description"]; | 240 | asset.Description = (String) row["Description"]; |
239 | asset.Type = Convert.ToSByte(row["Type"]); | ||
240 | asset.Local = Convert.ToBoolean(row["Local"]); | 241 | asset.Local = Convert.ToBoolean(row["Local"]); |
241 | asset.Temporary = Convert.ToBoolean(row["Temporary"]); | 242 | asset.Temporary = Convert.ToBoolean(row["Temporary"]); |
242 | asset.Data = (byte[]) row["Data"]; | 243 | asset.Data = (byte[]) row["Data"]; |