diff options
author | Homer Horwitz | 2008-09-19 21:32:41 +0000 |
---|---|---|
committer | Homer Horwitz | 2008-09-19 21:32:41 +0000 |
commit | 025441d722b6fa175cccb674aa4a08a34093323e (patch) | |
tree | fffff4f838a409bd0b57e82f70408f5eaff2fb41 /OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |
parent | add in bits to attempt to enable log4net on these tests to help when debugging (diff) | |
download | opensim-SC-025441d722b6fa175cccb674aa4a08a34093323e.zip opensim-SC-025441d722b6fa175cccb674aa4a08a34093323e.tar.gz opensim-SC-025441d722b6fa175cccb674aa4a08a34093323e.tar.bz2 opensim-SC-025441d722b6fa175cccb674aa4a08a34093323e.tar.xz |
Small formatting cleanup, before chi11ken notices. Me bad.
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteInventoryStore.cs')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index 49d351a..40b61ee 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |||
@@ -107,19 +107,23 @@ namespace OpenSim.Data.SQLite | |||
107 | /// </summary> | 107 | /// </summary> |
108 | public void Dispose() | 108 | public void Dispose() |
109 | { | 109 | { |
110 | if(conn != null) { | 110 | if (conn != null) |
111 | { | ||
111 | conn.Close(); | 112 | conn.Close(); |
112 | conn = null; | 113 | conn = null; |
113 | } | 114 | } |
114 | if(invItemsDa != null) { | 115 | if (invItemsDa != null) |
116 | { | ||
115 | invItemsDa.Dispose(); | 117 | invItemsDa.Dispose(); |
116 | invItemsDa = null; | 118 | invItemsDa = null; |
117 | } | 119 | } |
118 | if(invFoldersDa != null) { | 120 | if (invFoldersDa != null) |
121 | { | ||
119 | invFoldersDa.Dispose(); | 122 | invFoldersDa.Dispose(); |
120 | invFoldersDa = null; | 123 | invFoldersDa = null; |
121 | } | 124 | } |
122 | if(ds != null) { | 125 | if (ds != null) |
126 | { | ||
123 | ds.Dispose(); | 127 | ds.Dispose(); |
124 | ds = null; | 128 | ds = null; |
125 | } | 129 | } |
@@ -500,7 +504,8 @@ namespace OpenSim.Data.SQLite | |||
500 | // Current folder already has a sibling - append to sibling list | 504 | // Current folder already has a sibling - append to sibling list |
501 | hashtable[curFolder.ParentID].Add(curFolder); | 505 | hashtable[curFolder.ParentID].Add(curFolder); |
502 | } | 506 | } |
503 | else { | 507 | else |
508 | { | ||
504 | List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>(); | 509 | List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>(); |
505 | siblingList.Add(curFolder); | 510 | siblingList.Add(curFolder); |
506 | // Current folder has no known (yet) siblings | 511 | // Current folder has no known (yet) siblings |