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/SQLite | |
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 '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 49275cb..11be28e 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -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"]; |