From 8388fe0669f9d140028d1925284491b21a09a1bf Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Mon, 8 Sep 2008 14:30:35 +0000 Subject: * some if inversions and added {}'s for readability --- OpenSim/Region/Application/OpenSimBase.cs | 36 ++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/Application/OpenSimBase.cs') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index e2b2bbc..156d022 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -205,7 +205,10 @@ namespace OpenSim { IConfigSource DefaultConfig = new IniConfigSource(); if (DefaultConfig.Configs["Startup"] == null) + { DefaultConfig.AddConfig("Startup"); + } + IConfig config = DefaultConfig.Configs["Startup"]; if (config != null) { @@ -225,7 +228,9 @@ namespace OpenSim } if (DefaultConfig.Configs["StandAlone"] == null) + { DefaultConfig.AddConfig("StandAlone"); + } config = DefaultConfig.Configs["StandAlone"]; if (config != null) @@ -242,7 +247,10 @@ namespace OpenSim } if (DefaultConfig.Configs["Network"] == null) + { DefaultConfig.AddConfig("Network"); + } + config = DefaultConfig.Configs["Network"]; if (config != null) { @@ -262,7 +270,10 @@ namespace OpenSim } if (DefaultConfig.Configs["RemoteAdmin"] == null) + { DefaultConfig.AddConfig("RemoteAdmin"); + } + config = DefaultConfig.Configs["RemoteAdmin"]; if (config != null) { @@ -270,12 +281,16 @@ namespace OpenSim } if (DefaultConfig.Configs["Voice"] == null) + { DefaultConfig.AddConfig("Voice"); + } + config = DefaultConfig.Configs["Voice"]; if (config != null) { config.Set("enabled", "false"); } + return DefaultConfig; } @@ -741,18 +756,23 @@ namespace OpenSim return; } - if (null != inventoryFolder) + if (null == inventoryFolder) { - m_log.InfoFormat("[CONSOLE]: Found folder {0} {1} at {2}", inventoryFolder.Name, inventoryFolder.ID, invPath); - } - else if (null != inventoryItem) - { - m_log.InfoFormat("[CONSOLE]: Found item {0} {1} at {2}", inventoryItem.Name, inventoryItem.ID, invPath); + if (null == inventoryItem) + { + m_log.ErrorFormat("[CONSOLE]: Could not find inventory entry at path {0}", invPath); + return; + } + else + { + m_log.InfoFormat("[CONSOLE]: Found item {0} {1} at {2}", inventoryItem.Name, inventoryItem.ID, + invPath); + } } else { - m_log.ErrorFormat("[CONSOLE]: Could not find inventory entry at path {0}", invPath); - return; + m_log.InfoFormat("[CONSOLE]: Found folder {0} {1} at {2}", inventoryFolder.Name, inventoryFolder.ID, + invPath); } } -- cgit v1.1