OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small formatting cleanup, before chi11ken notices. Me bad.

0.6.0-stable
Homer Horwitz 2008-09-19 21:32:41 +00:00
parent 6dd2841ed8
commit 025441d722
3 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Data/SQLite/SQLiteInventoryStore.cs
View File

@ -107,19 +107,23 @@ namespace OpenSim.Data.SQLite
/// </summary>
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<InventoryFolderBase> siblingList = new List<InventoryFolderBase>();
siblingList.Add(curFolder);
// Current folder has no known (yet) siblings

29
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -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)

15
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

@ -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;
}