diff options
author | Dr Scofield | 2008-06-27 23:03:39 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 23:03:39 +0000 |
commit | 748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch) | |
tree | 58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Data/SQLite/SQLiteAssetData.cs | |
parent | more warnings to go. (diff) | |
download | opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2 opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz |
last round of warning squashing. calling it a day now.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 018501f..24c75e3 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -250,22 +250,22 @@ namespace OpenSim.Data.SQLite | |||
250 | /// Create the "assets" table | 250 | /// Create the "assets" table |
251 | /// </summary> | 251 | /// </summary> |
252 | /// <returns></returns> | 252 | /// <returns></returns> |
253 | private static DataTable createAssetsTable() | 253 | // private static DataTable createAssetsTable() |
254 | { | 254 | // { |
255 | DataTable assets = new DataTable("assets"); | 255 | // DataTable assets = new DataTable("assets"); |
256 | 256 | ||
257 | SQLiteUtil.createCol(assets, "UUID", typeof (String)); | 257 | // SQLiteUtil.createCol(assets, "UUID", typeof (String)); |
258 | SQLiteUtil.createCol(assets, "Name", typeof (String)); | 258 | // SQLiteUtil.createCol(assets, "Name", typeof (String)); |
259 | SQLiteUtil.createCol(assets, "Description", typeof (String)); | 259 | // SQLiteUtil.createCol(assets, "Description", typeof (String)); |
260 | SQLiteUtil.createCol(assets, "Type", typeof (Int32)); | 260 | // SQLiteUtil.createCol(assets, "Type", typeof (Int32)); |
261 | SQLiteUtil.createCol(assets, "InvType", typeof (Int32)); | 261 | // SQLiteUtil.createCol(assets, "InvType", typeof (Int32)); |
262 | SQLiteUtil.createCol(assets, "Local", typeof (Boolean)); | 262 | // SQLiteUtil.createCol(assets, "Local", typeof (Boolean)); |
263 | SQLiteUtil.createCol(assets, "Temporary", typeof (Boolean)); | 263 | // SQLiteUtil.createCol(assets, "Temporary", typeof (Boolean)); |
264 | SQLiteUtil.createCol(assets, "Data", typeof (Byte[])); | 264 | // SQLiteUtil.createCol(assets, "Data", typeof (Byte[])); |
265 | // Add in contraints | 265 | // // Add in contraints |
266 | assets.PrimaryKey = new DataColumn[] {assets.Columns["UUID"]}; | 266 | // assets.PrimaryKey = new DataColumn[] {assets.Columns["UUID"]}; |
267 | return assets; | 267 | // return assets; |
268 | } | 268 | // } |
269 | 269 | ||
270 | /*********************************************************************** | 270 | /*********************************************************************** |
271 | * | 271 | * |
@@ -312,12 +312,12 @@ namespace OpenSim.Data.SQLite | |||
312 | /// | 312 | /// |
313 | /// </summary> | 313 | /// </summary> |
314 | /// <param name="conn"></param> | 314 | /// <param name="conn"></param> |
315 | private static void InitDB(SqliteConnection conn) | 315 | // private static void InitDB(SqliteConnection conn) |
316 | { | 316 | // { |
317 | string createAssets = SQLiteUtil.defineTable(createAssetsTable()); | 317 | // string createAssets = SQLiteUtil.defineTable(createAssetsTable()); |
318 | SqliteCommand pcmd = new SqliteCommand(createAssets, conn); | 318 | // SqliteCommand pcmd = new SqliteCommand(createAssets, conn); |
319 | pcmd.ExecuteNonQuery(); | 319 | // pcmd.ExecuteNonQuery(); |
320 | } | 320 | // } |
321 | 321 | ||
322 | /// <summary> | 322 | /// <summary> |
323 | /// | 323 | /// |
@@ -358,7 +358,7 @@ namespace OpenSim.Data.SQLite | |||
358 | get | 358 | get |
359 | { | 359 | { |
360 | Module module = GetType().Module; | 360 | Module module = GetType().Module; |
361 | string dllName = module.Assembly.ManifestModule.Name; | 361 | // string dllName = module.Assembly.ManifestModule.Name; |
362 | Version dllVersion = module.Assembly.GetName().Version; | 362 | Version dllVersion = module.Assembly.GetName().Version; |
363 | 363 | ||
364 | return | 364 | return |