aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.SQLite
diff options
context:
space:
mode:
authorMW2007-10-08 10:30:15 +0000
committerMW2007-10-08 10:30:15 +0000
commit4c25008850f92bcc79502c71a0e4d34c883d27d0 (patch)
treec5dd571fb11699675c80d363b3261c5be477c018 /OpenSim/Framework/Data.SQLite
parentsmall bug fix (diff)
downloadopensim-SC_OLD-4c25008850f92bcc79502c71a0e4d34c883d27d0.zip
opensim-SC_OLD-4c25008850f92bcc79502c71a0e4d34c883d27d0.tar.gz
opensim-SC_OLD-4c25008850f92bcc79502c71a0e4d34c883d27d0.tar.bz2
opensim-SC_OLD-4c25008850f92bcc79502c71a0e4d34c883d27d0.tar.xz
Applied patch 485, inventory patch from tleiades (thanks again).
Diffstat (limited to 'OpenSim/Framework/Data.SQLite')
-rw-r--r--OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs29
2 files changed, 27 insertions, 4 deletions
diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index 8136bc1..75bb53d 100644
--- a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
29// 29//
30// You can specify all the values or you can default the Revision and Build Numbers 30// You can specify all the values or you can default the Revision and Build Numbers
31// by using the '*' as shown below: 31// by using the '*' as shown below:
32[assembly: AssemblyVersion("1.0.0.0")] 32[assembly: AssemblyVersion("0.4.0.0")]
33[assembly: AssemblyFileVersion("1.0.0.0")] 33[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
index 4c9c467..1688b709 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
@@ -1,6 +1,7 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using System.Reflection;
4 5
5using OpenSim.Framework.Console; 6using OpenSim.Framework.Console;
6using OpenSim.Framework.Types; 7using OpenSim.Framework.Types;
@@ -166,7 +167,12 @@ namespace OpenSim.Framework.Data.SQLite
166 /// <returns>A string containing the plugin version</returns> 167 /// <returns>A string containing the plugin version</returns>
167 public string getVersion() 168 public string getVersion()
168 { 169 {
169 return "0.1"; 170 System.Reflection.Module module = this.GetType().Module;
171 string dllName = module.Assembly.ManifestModule.Name;
172 Version dllVersion = module.Assembly.GetName().Version;
173
174
175 return string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build, dllVersion.Revision);
170 } 176 }
171 177
172 /// <summary> 178 /// <summary>
@@ -337,11 +343,11 @@ namespace OpenSim.Framework.Data.SQLite
337 /// 343 ///
338 /// </summary> 344 /// </summary>
339 /// <param name="item"></param> 345 /// <param name="item"></param>
340 public void deleteInventoryItem(InventoryItemBase item) 346 public void deleteInventoryItem(LLUUID itemID)
341 { 347 {
342 DataTable inventoryItemTable = ds.Tables["inventoryitems"]; 348 DataTable inventoryItemTable = ds.Tables["inventoryitems"];
343 349
344 DataRow inventoryRow = inventoryItemTable.Rows.Find(item.inventoryID); 350 DataRow inventoryRow = inventoryItemTable.Rows.Find(itemID);
345 if (inventoryRow != null) 351 if (inventoryRow != null)
346 { 352 {
347 inventoryRow.Delete(); 353 inventoryRow.Delete();
@@ -350,6 +356,20 @@ namespace OpenSim.Framework.Data.SQLite
350 this.invItemsDa.Update(ds, "inventoryitems"); 356 this.invItemsDa.Update(ds, "inventoryitems");
351 } 357 }
352 358
359
360 /// <summary>
361 /// Delete all items in the specified folder
362 /// </summary>
363 /// <param name="folderId">id of the folder, whose item content should be deleted</param>
364 //!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementatio
365 private void deleteItemsInFolder(LLUUID folderId)
366 {
367 List<InventoryItemBase> items = getInventoryInFolder(folderId);
368
369 foreach(InventoryItemBase i in items)
370 deleteInventoryItem(i.inventoryID);
371 }
372
353 /// <summary> 373 /// <summary>
354 /// Adds a new folder specified by folder 374 /// Adds a new folder specified by folder
355 /// </summary> 375 /// </summary>
@@ -389,6 +409,7 @@ namespace OpenSim.Framework.Data.SQLite
389 inventoryRow = inventoryFolderTable.Rows.Find(f.folderID); 409 inventoryRow = inventoryFolderTable.Rows.Find(f.folderID);
390 if (inventoryRow != null) 410 if (inventoryRow != null)
391 { 411 {
412 deleteItemsInFolder(f.folderID);
392 inventoryRow.Delete(); 413 inventoryRow.Delete();
393 } 414 }
394 } 415 }
@@ -397,6 +418,7 @@ namespace OpenSim.Framework.Data.SQLite
397 inventoryRow = inventoryFolderTable.Rows.Find(folderID); 418 inventoryRow = inventoryFolderTable.Rows.Find(folderID);
398 if (inventoryRow != null) 419 if (inventoryRow != null)
399 { 420 {
421 deleteItemsInFolder(folderID);
400 inventoryRow.Delete(); 422 inventoryRow.Delete();
401 } 423 }
402 424
@@ -554,3 +576,4 @@ namespace OpenSim.Framework.Data.SQLite
554} 576}
555 577
556 578
579