aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs9
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs19
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs2
4 files changed, 26 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
index 556b843..b2f697c 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
@@ -85,9 +85,9 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
85 drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", drawPrimVolume); 85 drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", drawPrimVolume);
86 textureTerrain = startupConfig.GetBoolean("TextureOnMapTile", textureTerrain); 86 textureTerrain = startupConfig.GetBoolean("TextureOnMapTile", textureTerrain);
87 } 87 }
88 catch (Exception) 88 catch
89 { 89 {
90 m_log.Warn("Failed to load StartupConfig"); 90 m_log.Warn("[MAPTILE]: Failed to load StartupConfig");
91 } 91 }
92 92
93 if (textureTerrain) 93 if (textureTerrain)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 647682e..4621422 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -334,9 +334,9 @@ namespace OpenSim.Region.Environment.Scenes
334 334
335 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); 335 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine");
336 } 336 }
337 catch (Exception) 337 catch
338 { 338 {
339 m_log.Warn("Failed to load StartupConfig"); 339 m_log.Warn("[SCENE]: Failed to load StartupConfig");
340 } 340 }
341 } 341 }
342 342
@@ -1307,6 +1307,7 @@ namespace OpenSim.Region.Environment.Scenes
1307 //tc = System.Environment.TickCount - tc; 1307 //tc = System.Environment.TickCount - tc;
1308 //m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms"); 1308 //m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms");
1309 } 1309 }
1310
1310 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms"); 1311 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms");
1311 1312
1312 bool drawPrimVolume = true; 1313 bool drawPrimVolume = true;
@@ -1316,9 +1317,9 @@ namespace OpenSim.Region.Environment.Scenes
1316 IConfig startupConfig = m_config.Configs["Startup"]; 1317 IConfig startupConfig = m_config.Configs["Startup"];
1317 drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", true); 1318 drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", true);
1318 } 1319 }
1319 catch (Exception) 1320 catch
1320 { 1321 {
1321 m_log.Warn("Failed to load StartupConfig"); 1322 m_log.Warn("[MAPTILE]: Failed to load StartupConfig");
1322 } 1323 }
1323 1324
1324 if (drawPrimVolume) 1325 if (drawPrimVolume)
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
index 0ec4a8b..dd0ca8c 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
@@ -40,6 +40,19 @@ namespace OpenSim.Region.Environment.Scenes.Tests
40 [TestFixture] 40 [TestFixture]
41 public class SceneTests 41 public class SceneTests
42 { 42 {
43 [SetUp]
44 public void Init()
45 {
46 try
47 {
48 log4net.Config.XmlConfigurator.Configure();
49 }
50 catch
51 {
52 // I don't care, just leave log4net off
53 }
54 }
55
43 /// <summary> 56 /// <summary>
44 /// Test adding an object to a scene. Doesn't yet do what it says on the tin. 57 /// Test adding an object to a scene. Doesn't yet do what it says on the tin.
45 /// </summary> 58 /// </summary>
@@ -56,7 +69,11 @@ namespace OpenSim.Region.Environment.Scenes.Tests
56 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); 69 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
57 IConfigSource configSource = new IniConfigSource(); 70 IConfigSource configSource = new IniConfigSource();
58 71
59 new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); 72 Scene scene
73 = new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);
74
75 SceneObjectGroup sceneObject = new SceneObjectGroup();
76 scene.AddNewSceneObject(sceneObject, false);
60 } 77 }
61 } 78 }
62} \ No newline at end of file 79} \ No newline at end of file
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index db41251..fc8f062 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Physics.Manager
124 } 124 }
125 catch (Exception ex) 125 catch (Exception ex)
126 { 126 {
127 m_log.Error("Failed to load plugin from " + FileName, ex); 127 m_log.Error("[PHYSICS]: Failed to load plugin from " + FileName, ex);
128 } 128 }
129 129
130 if (pluginAssembly != null) 130 if (pluginAssembly != null)