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

* minor: Make some 'startup config failed to load' log messages more consistent

0.6.0-stable
Justin Clarke Casey 2008-11-06 20:38:04 +00:00
parent c932aae4c3
commit 9770cf778e
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
View File

@ -85,9 +85,9 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", drawPrimVolume); drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", drawPrimVolume);
textureTerrain = startupConfig.GetBoolean("TextureOnMapTile", textureTerrain); textureTerrain = startupConfig.GetBoolean("TextureOnMapTile", textureTerrain);
} }
catch (Exception) catch
{ {
m_log.Warn("Failed to load StartupConfig"); m_log.Warn("[MAPTILE]: Failed to load StartupConfig");
} }
if (textureTerrain) if (textureTerrain)

9
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -334,9 +334,9 @@ namespace OpenSim.Region.Environment.Scenes
m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine");
} }
catch (Exception) catch
{ {
m_log.Warn("Failed to load StartupConfig"); m_log.Warn("[SCENE]: Failed to load StartupConfig");
} }
} }
@ -1307,6 +1307,7 @@ namespace OpenSim.Region.Environment.Scenes
//tc = System.Environment.TickCount - tc; //tc = System.Environment.TickCount - tc;
//m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms"); //m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms");
} }
m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms"); m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms");
bool drawPrimVolume = true; bool drawPrimVolume = true;
@ -1316,9 +1317,9 @@ namespace OpenSim.Region.Environment.Scenes
IConfig startupConfig = m_config.Configs["Startup"]; IConfig startupConfig = m_config.Configs["Startup"];
drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", true); drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", true);
} }
catch (Exception) catch
{ {
m_log.Warn("Failed to load StartupConfig"); m_log.Warn("[MAPTILE]: Failed to load StartupConfig");
} }
if (drawPrimVolume) if (drawPrimVolume)

19
OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
View File

@ -40,6 +40,19 @@ namespace OpenSim.Region.Environment.Scenes.Tests
[TestFixture] [TestFixture]
public class SceneTests public class SceneTests
{ {
[SetUp]
public void Init()
{
try
{
log4net.Config.XmlConfigurator.Configure();
}
catch
{
// I don't care, just leave log4net off
}
}
/// <summary> /// <summary>
/// Test adding an object to a scene. Doesn't yet do what it says on the tin. /// Test adding an object to a scene. Doesn't yet do what it says on the tin.
/// </summary> /// </summary>
@ -56,7 +69,11 @@ namespace OpenSim.Region.Environment.Scenes.Tests
StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
IConfigSource configSource = new IniConfigSource(); IConfigSource configSource = new IniConfigSource();
new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); Scene scene
= new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);
SceneObjectGroup sceneObject = new SceneObjectGroup();
scene.AddNewSceneObject(sceneObject, false);
} }
} }
} }

2
OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
View File

@ -124,7 +124,7 @@ namespace OpenSim.Region.Physics.Manager
} }
catch (Exception ex) catch (Exception ex)
{ {
m_log.Error("Failed to load plugin from " + FileName, ex); m_log.Error("[PHYSICS]: Failed to load plugin from " + FileName, ex);
} }
if (pluginAssembly != null) if (pluginAssembly != null)