aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs94
2 files changed, 90 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 11dd052..a7e7d03 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -447,7 +447,7 @@ namespace OpenSim
447 if (alert != null) 447 if (alert != null)
448 presence.ControllingClient.Kick(alert); 448 presence.ControllingClient.Kick(alert);
449 else 449 else
450 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 450 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
451 451
452 presence.Scene.IncomingCloseAgent(presence.UUID, force); 452 presence.Scene.IncomingCloseAgent(presence.UUID, force);
453 } 453 }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index c555915..7361f50 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -97,6 +97,10 @@ namespace OpenSim
97 97
98 protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); 98 protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
99 99
100 private List<string> m_permsModules;
101
102 private bool m_securePermissionsLoading = true;
103
100 /// <value> 104 /// <value>
101 /// The config information passed into the OpenSimulator region server. 105 /// The config information passed into the OpenSimulator region server.
102 /// </value> 106 /// </value>
@@ -188,6 +192,11 @@ namespace OpenSim
188 CreatePIDFile(pidFile); 192 CreatePIDFile(pidFile);
189 193
190 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty); 194 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
195
196 m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true);
197
198 string permissionModules = startupConfig.GetString("permissionmodules", "DefaultPermissionsModule");
199 m_permsModules = new List<string>(permissionModules.Split(','));
191 } 200 }
192 201
193 // Load the simulation data service 202 // Load the simulation data service
@@ -225,6 +234,12 @@ namespace OpenSim
225 base.StartupSpecific(); 234 base.StartupSpecific();
226 235
227 LoadPlugins(); 236 LoadPlugins();
237
238 if (m_plugins.Count == 0) // We failed to load any modules. Mono Addins glitch!
239 {
240 Environment.Exit(1);
241 }
242
228 foreach (IApplicationPlugin plugin in m_plugins) 243 foreach (IApplicationPlugin plugin in m_plugins)
229 { 244 {
230 plugin.PostInitialise(); 245 plugin.PostInitialise();
@@ -251,10 +266,10 @@ namespace OpenSim
251 "help " + capitalizedTopic, 266 "help " + capitalizedTopic,
252 "Get help on plugin command '" + topic + "'", 267 "Get help on plugin command '" + topic + "'",
253 HandleCommanderHelp); 268 HandleCommanderHelp);
254 console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic, 269// console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic,
255 "help " + capitalizedTopic, 270// "help " + capitalizedTopic,
256 "Get help on plugin command '" + topic + "'", 271// "Get help on plugin command '" + topic + "'",
257 HandleCommanderHelp); 272// HandleCommanderHelp);
258 273
259 ICommander commander = null; 274 ICommander commander = null;
260 275
@@ -377,7 +392,42 @@ namespace OpenSim
377 } 392 }
378 else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing..."); 393 else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing...");
379 394
395 // XPTO: Fix this
396// if (m_securePermissionsLoading)
397// {
398// foreach (string s in m_permsModules)
399// {
400// if (!scene.RegionModules.ContainsKey(s))
401// {
402// bool found = false;
403// foreach (IRegionModule m in modules)
404// {
405// if (m.Name == s)
406// {
407// found = true;
408// }
409// }
410// if (!found)
411// {
412// m_log.Fatal("[MODULES]: Required module " + s + " not found.");
413// Environment.Exit(0);
414// }
415// }
416// }
417// }
418
380 scene.SetModuleInterfaces(); 419 scene.SetModuleInterfaces();
420// First Step of bootreport sequence
421 if (scene.SnmpService != null)
422 {
423 scene.SnmpService.ColdStart(1,scene);
424 scene.SnmpService.LinkDown(scene);
425 }
426
427 if (scene.SnmpService != null)
428 {
429 scene.SnmpService.BootInfo("Loading prins", scene);
430 }
381 431
382 while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) 432 while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
383 SetUpEstateOwner(scene); 433 SetUpEstateOwner(scene);
@@ -391,6 +441,11 @@ namespace OpenSim
391 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); 441 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
392 scene.EventManager.TriggerParcelPrimCountUpdate(); 442 scene.EventManager.TriggerParcelPrimCountUpdate();
393 443
444 if (scene.SnmpService != null)
445 {
446 scene.SnmpService.BootInfo("Grid Registration in progress", scene);
447 }
448
394 try 449 try
395 { 450 {
396 scene.RegisterRegionWithGrid(); 451 scene.RegisterRegionWithGrid();
@@ -401,15 +456,29 @@ namespace OpenSim
401 "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}", 456 "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}",
402 e.Message, e.StackTrace); 457 e.Message, e.StackTrace);
403 458
459 if (scene.SnmpService != null)
460 {
461 scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene);
462 }
404 // Carrying on now causes a lot of confusion down the 463 // Carrying on now causes a lot of confusion down the
405 // line - we need to get the user's attention 464 // line - we need to get the user's attention
406 Environment.Exit(1); 465 Environment.Exit(1);
407 } 466 }
408 467
468 if (scene.SnmpService != null)
469 {
470 scene.SnmpService.BootInfo("Grid Registration done", scene);
471 }
472
409 // We need to do this after we've initialized the 473 // We need to do this after we've initialized the
410 // scripting engines. 474 // scripting engines.
411 scene.CreateScriptInstances(); 475 scene.CreateScriptInstances();
412 476
477 if (scene.SnmpService != null)
478 {
479 scene.SnmpService.BootInfo("ScriptEngine started", scene);
480 }
481
413 SceneManager.Add(scene); 482 SceneManager.Add(scene);
414 483
415 if (m_autoCreateClientStack) 484 if (m_autoCreateClientStack)
@@ -421,10 +490,20 @@ namespace OpenSim
421 } 490 }
422 } 491 }
423 492
493 if (scene.SnmpService != null)
494 {
495 scene.SnmpService.BootInfo("Initializing region modules", scene);
496 }
424 scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); }; 497 scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); };
425 498
426 mscene = scene; 499 mscene = scene;
427 500
501 if (scene.SnmpService != null)
502 {
503 scene.SnmpService.BootInfo("The region is operational", scene);
504 scene.SnmpService.LinkUp(scene);
505 }
506
428 scene.Start(); 507 scene.Start();
429 scene.StartScripts(); 508 scene.StartScripts();
430 509
@@ -543,6 +622,11 @@ namespace OpenSim
543 private void ShutdownRegion(Scene scene) 622 private void ShutdownRegion(Scene scene)
544 { 623 {
545 m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName); 624 m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName);
625 if (scene.SnmpService != null)
626 {
627 scene.SnmpService.BootInfo("The region is shutting down", scene);
628 scene.SnmpService.LinkDown(scene);
629 }
546 IRegionModulesController controller; 630 IRegionModulesController controller;
547 if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller)) 631 if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller))
548 { 632 {
@@ -1089,4 +1173,4 @@ namespace OpenSim
1089 { 1173 {
1090 public IConfigSource Source; 1174 public IConfigSource Source;
1091 } 1175 }
1092} \ No newline at end of file 1176}