From 025441d722b6fa175cccb674aa4a08a34093323e Mon Sep 17 00:00:00 2001 From: Homer Horwitz Date: Fri, 19 Sep 2008 21:32:41 +0000 Subject: Small formatting cleanup, before chi11ken notices. Me bad. --- OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 15 ++++++++++----- OpenSim/Data/SQLite/SQLiteRegionData.cs | 29 +++++++++++++++++++---------- OpenSim/Data/SQLite/SQLiteUserData.cs | 15 ++++++++++----- 3 files changed, 39 insertions(+), 20 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 /// public void Dispose() { - if(conn != null) { + if (conn != null) + { conn.Close(); conn = null; } - if(invItemsDa != null) { + if (invItemsDa != null) + { invItemsDa.Dispose(); invItemsDa = null; } - if(invFoldersDa != null) { + if (invFoldersDa != null) + { invFoldersDa.Dispose(); invFoldersDa = null; } - if(ds != null) { + if (ds != null) + { ds.Dispose(); ds = null; } @@ -500,7 +504,8 @@ namespace OpenSim.Data.SQLite // Current folder already has a sibling - append to sibling list hashtable[curFolder.ParentID].Add(curFolder); } - else { + else + { List siblingList = new List(); siblingList.Add(curFolder); // Current folder has no known (yet) siblings 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 public void Dispose() { - if(m_conn != null) { + if (m_conn != null) + { m_conn.Close(); m_conn = null; } - if(ds != null) { + if (ds != null) + { ds.Dispose(); ds = null; } - if(primDa != null) { + if (primDa != null) + { primDa.Dispose(); primDa = null; } - if(shapeDa != null) { + if (shapeDa != null) + { shapeDa.Dispose(); shapeDa = null; } - if(itemsDa != null) { + if (itemsDa != null) + { itemsDa.Dispose(); itemsDa = null; } - if(terrainDa != null) { + if (terrainDa != null) + { terrainDa.Dispose(); terrainDa = null; } - if(landDa != null) { + if (landDa != null) + { landDa.Dispose(); landDa = null; } - if(landAccessListDa != null) { + if (landAccessListDa != null) + { landAccessListDa.Dispose(); landAccessListDa = null; } - if(regionSettingsDa != null) { + if (regionSettingsDa != null) + { regionSettingsDa.Dispose(); regionSettingsDa = null; } } - + public void StoreRegionSettings(RegionSettings rs) { lock (ds) diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs index a238ebf..f847ba9 100644 --- a/OpenSim/Data/SQLite/SQLiteUserData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserData.cs @@ -124,23 +124,28 @@ namespace OpenSim.Data.SQLite public override void Dispose () { - if(g_conn != null) { + if (g_conn != null) + { g_conn.Close(); g_conn = null; } - if(ds != null) { + if (ds != null) + { ds.Dispose(); ds = null; } - if(da != null) { + if (da != null) + { da.Dispose(); da = null; } - if(daf != null) { + if (daf != null) + { daf.Dispose(); daf = null; } - if(dua != null) { + if (dua != null) + { dua.Dispose(); dua = null; } -- cgit v1.1