aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteRegionData.cs
diff options
context:
space:
mode:
authorHomer Horwitz2008-09-18 20:10:09 +0000
committerHomer Horwitz2008-09-18 20:10:09 +0000
commit1c08f46ec3397f4e4fd5897107c0df89bec70d84 (patch)
tree9c6896ead729fcf0f0a9357f4a232ce2ad1d6106 /OpenSim/Data/SQLite/SQLiteRegionData.cs
parent* Apply http://opensimulator.org/mantis/view.php?id=2212 (diff)
downloadopensim-SC_OLD-1c08f46ec3397f4e4fd5897107c0df89bec70d84.zip
opensim-SC_OLD-1c08f46ec3397f4e4fd5897107c0df89bec70d84.tar.gz
opensim-SC_OLD-1c08f46ec3397f4e4fd5897107c0df89bec70d84.tar.bz2
opensim-SC_OLD-1c08f46ec3397f4e4fd5897107c0df89bec70d84.tar.xz
- Add Dispose method to IRegionDataStore
- Add necessary dummy Dispose-methods where they are missing - Implement the SQLite Dispose-methods (currently only used for unit tests, in the next commit)
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteRegionData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs40
1 files changed, 40 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 36b3d2f..f71535f 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -203,6 +203,46 @@ namespace OpenSim.Data.SQLite
203 } 203 }
204 } 204 }
205 205
206 public void Dispose()
207 {
208 if(m_conn != null) {
209 m_conn.Close();
210 m_conn = null;
211 }
212 if(ds != null) {
213 ds.Dispose();
214 ds = null;
215 }
216 if(primDa != null) {
217 primDa.Dispose();
218 primDa = null;
219 }
220 if(shapeDa != null) {
221 shapeDa.Dispose();
222 shapeDa = null;
223 }
224 if(itemsDa != null) {
225 itemsDa.Dispose();
226 itemsDa = null;
227 }
228 if(terrainDa != null) {
229 terrainDa.Dispose();
230 terrainDa = null;
231 }
232 if(landDa != null) {
233 landDa.Dispose();
234 landDa = null;
235 }
236 if(landAccessListDa != null) {
237 landAccessListDa.Dispose();
238 landAccessListDa = null;
239 }
240 if(regionSettingsDa != null) {
241 regionSettingsDa.Dispose();
242 regionSettingsDa = null;
243 }
244 }
245
206 public void StoreRegionSettings(RegionSettings rs) 246 public void StoreRegionSettings(RegionSettings rs)
207 { 247 {
208 lock (ds) 248 lock (ds)