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/SQLiteRegionData.cs | |
| parent | add in bits to attempt to enable log4net on these tests to help when debugging (diff) | |
| download | opensim-SC_OLD-025441d722b6fa175cccb674aa4a08a34093323e.zip opensim-SC_OLD-025441d722b6fa175cccb674aa4a08a34093323e.tar.gz opensim-SC_OLD-025441d722b6fa175cccb674aa4a08a34093323e.tar.bz2 opensim-SC_OLD-025441d722b6fa175cccb674aa4a08a34093323e.tar.xz | |
Small formatting cleanup, before chi11ken notices. Me bad.
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteRegionData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index f71535f..13f9938 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
| @@ -205,44 +205,53 @@ namespace OpenSim.Data.SQLite | |||
| 205 | 205 | ||
| 206 | public void Dispose() | 206 | public void Dispose() |
| 207 | { | 207 | { |
| 208 | if(m_conn != null) { | 208 | if (m_conn != null) |
| 209 | { | ||
| 209 | m_conn.Close(); | 210 | m_conn.Close(); |
| 210 | m_conn = null; | 211 | m_conn = null; |
| 211 | } | 212 | } |
| 212 | if(ds != null) { | 213 | if (ds != null) |
| 214 | { | ||
| 213 | ds.Dispose(); | 215 | ds.Dispose(); |
| 214 | ds = null; | 216 | ds = null; |
| 215 | } | 217 | } |
| 216 | if(primDa != null) { | 218 | if (primDa != null) |
| 219 | { | ||
| 217 | primDa.Dispose(); | 220 | primDa.Dispose(); |
| 218 | primDa = null; | 221 | primDa = null; |
| 219 | } | 222 | } |
| 220 | if(shapeDa != null) { | 223 | if (shapeDa != null) |
| 224 | { | ||
| 221 | shapeDa.Dispose(); | 225 | shapeDa.Dispose(); |
| 222 | shapeDa = null; | 226 | shapeDa = null; |
| 223 | } | 227 | } |
| 224 | if(itemsDa != null) { | 228 | if (itemsDa != null) |
| 229 | { | ||
| 225 | itemsDa.Dispose(); | 230 | itemsDa.Dispose(); |
| 226 | itemsDa = null; | 231 | itemsDa = null; |
| 227 | } | 232 | } |
| 228 | if(terrainDa != null) { | 233 | if (terrainDa != null) |
| 234 | { | ||
| 229 | terrainDa.Dispose(); | 235 | terrainDa.Dispose(); |
| 230 | terrainDa = null; | 236 | terrainDa = null; |
| 231 | } | 237 | } |
| 232 | if(landDa != null) { | 238 | if (landDa != null) |
| 239 | { | ||
| 233 | landDa.Dispose(); | 240 | landDa.Dispose(); |
| 234 | landDa = null; | 241 | landDa = null; |
| 235 | } | 242 | } |
| 236 | if(landAccessListDa != null) { | 243 | if (landAccessListDa != null) |
| 244 | { | ||
| 237 | landAccessListDa.Dispose(); | 245 | landAccessListDa.Dispose(); |
| 238 | landAccessListDa = null; | 246 | landAccessListDa = null; |
| 239 | } | 247 | } |
| 240 | if(regionSettingsDa != null) { | 248 | if (regionSettingsDa != null) |
| 249 | { | ||
| 241 | regionSettingsDa.Dispose(); | 250 | regionSettingsDa.Dispose(); |
| 242 | regionSettingsDa = null; | 251 | regionSettingsDa = null; |
| 243 | } | 252 | } |
| 244 | } | 253 | } |
| 245 | 254 | ||
| 246 | public void StoreRegionSettings(RegionSettings rs) | 255 | public void StoreRegionSettings(RegionSettings rs) |
| 247 | { | 256 | { |
| 248 | lock (ds) | 257 | lock (ds) |