aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs27
1 files changed, 17 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 0b51759..8377d84 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -61,6 +61,8 @@ namespace OpenSim
61 public bool user_accounts; 61 public bool user_accounts;
62 public bool m_gridLocalAsset; 62 public bool m_gridLocalAsset;
63 63
64 protected ModuleLoader m_moduleLoader;
65
64 protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll"; 66 protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll";
65 67
66 protected string m_startupCommandsFile = ""; 68 protected string m_startupCommandsFile = "";
@@ -168,6 +170,8 @@ namespace OpenSim
168 configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); 170 configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
169 } 171 }
170 172
173 m_moduleLoader = new ModuleLoader();
174
171 // Load all script engines found 175 // Load all script engines found
172 OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log); 176 OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log);
173 177
@@ -225,7 +229,7 @@ namespace OpenSim
225 229
226 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager) 230 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager)
227 { 231 {
228 return new Scene(regionInfo, circuitManager, m_commsManager, m_assetCache, storageManager, m_httpServer); 232 return new Scene(regionInfo, circuitManager, m_commsManager, m_assetCache, storageManager, m_httpServer, m_moduleLoader);
229 } 233 }
230 234
231 protected override void Initialize() 235 protected override void Initialize()
@@ -491,15 +495,18 @@ namespace OpenSim
491 if (entity is ScenePresence) 495 if (entity is ScenePresence)
492 { 496 {
493 ScenePresence scenePrescence = entity as ScenePresence; 497 ScenePresence scenePrescence = entity as ScenePresence;
494 m_log.Error( 498 if (!scenePrescence.childAgent)
495 String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", 499 {
496 scenePrescence.Firstname, 500 m_log.Error(
497 scenePrescence.Lastname, 501 String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
498 scenePrescence.UUID, 502 scenePrescence.Firstname,
499 scenePrescence.ControllingClient.AgentId, 503 scenePrescence.Lastname,
500 "Unknown", 504 scenePrescence.UUID,
501 "Unknown", 505 scenePrescence.ControllingClient.AgentId,
502 scene.RegionInfo.RegionName)); 506 "Unknown",
507 "Unknown",
508 scene.RegionInfo.RegionName));
509 }
503 } 510 }
504 } 511 }
505 } 512 }