ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

* some if inversions and added {}'s for readability

Browse Source
This commit is contained in:
lbsa71
2008-09-08 14:30:35 +00:00
parent f2de15bffc
commit 8388fe0669
7 changed files with 92 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenSim/Region/Application/OpenSimBase.cs
View File

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