1 files changed, 25 insertions, 8 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index ca7e612..49d351a 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -46,6 +46,7 @@ namespace OpenSim.Data.SQLite
         private const string invItemsSelect = "select * from inventoryitems";
         private const string invFoldersSelect = "select * from inventoryfolders";
 
+        private SqliteConnection conn;
         private DataSet ds;
         private SqliteDataAdapter invItemsDa;
         private SqliteDataAdapter invFoldersDa;
@@ -71,7 +72,7 @@ namespace OpenSim.Data.SQLite
                 dbconnect = "URI=file:inventoryStore.db,version=3";
             }
             m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect);
-            SqliteConnection conn = new SqliteConnection(dbconnect);
+            conn = new SqliteConnection(dbconnect);
 
             conn.Open();
 
@@ -102,6 +103,29 @@ namespace OpenSim.Data.SQLite
         }
 
         /// <summary>
+        /// Closes the inventory interface
+        /// </summary>
+        public void Dispose()
+        {
+            if(conn != null) {
+                conn.Close();
+                conn = null;
+            }
+            if(invItemsDa != null) {
+                invItemsDa.Dispose();
+                invItemsDa = null;
+            }
+            if(invFoldersDa != null) {
+                invFoldersDa.Dispose();
+                invFoldersDa = null;
+            }
+            if(ds != null) {
+                ds.Dispose();
+                ds = null;
+            }
+        }
+
+        /// <summary>
         ///
         /// </summary>
         /// <param name="row"></param>
@@ -278,13 +302,6 @@ namespace OpenSim.Data.SQLite
         }
 
         /// <summary>
-        /// Closes the inventory interface
-        /// </summary>
-        public void Dispose()
-        {
-        }
-
-        /// <summary>
         /// The name of this DB provider
         /// </summary>
         /// <returns>Name of DB provider</returns>