aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs2
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs4
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs4
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs5
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs4
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Region/Application/Application.cs4
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBackground.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs4
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs4
12 files changed, 26 insertions, 21 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index c2633f8..dfc9c0a 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Servers
73 /// <summary> 73 /// <summary>
74 /// Performs initialisation of the scene, such as loading configuration from disk. 74 /// Performs initialisation of the scene, such as loading configuration from disk.
75 /// </summary> 75 /// </summary>
76 public virtual void StartUp() 76 public virtual void Startup()
77 { 77 {
78 EnhanceVersionInformation(); 78 EnhanceVersionInformation();
79 79
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 83a6c89..a118a90 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -85,8 +85,10 @@ namespace OpenSim.Grid.AssetServer
85 MainConsole.Instance = m_console; 85 MainConsole.Instance = m_console;
86 } 86 }
87 87
88 public void Startup() 88 public override void Startup()
89 { 89 {
90 base.Startup();
91
90 m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml"))); 92 m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
91 93
92 m_log.Info("[ASSET]: Setting up asset DB"); 94 m_log.Info("[ASSET]: Setting up asset DB");
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index a22f685..8ca4296 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -74,9 +74,9 @@ namespace OpenSim.Grid.GridServer
74 } 74 }
75 } 75 }
76 76
77 public void Startup() 77 public override void Startup()
78 { 78 {
79 m_log.Info("[GRID]: Starting..."); 79 base.Startup();
80 80
81 Config(); 81 Config();
82 82
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index ae76cd4..4300554 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -64,9 +64,10 @@ namespace OpenSim.Grid.InventoryServer
64 MainConsole.Instance = m_console; 64 MainConsole.Instance = m_console;
65 } 65 }
66 66
67 public void Startup() 67 public override void Startup()
68 { 68 {
69 m_log.Info("Initialising inventory manager..."); 69 base.Startup();
70
70 m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); 71 m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
71 72
72 m_inventoryService = new GridInventoryService(); 73 m_inventoryService = new GridInventoryService();
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 5c1fb19..d2fa659 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -79,8 +79,10 @@ namespace OpenSim.Grid.MessagingServer
79 } 79 }
80 } 80 }
81 81
82 public void Startup() 82 public override void Startup()
83 { 83 {
84 base.Startup();
85
84 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); 86 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
85 87
86 m_log.Info("[REGION]: Starting HTTP process"); 88 m_log.Info("[REGION]: Starting HTTP process");
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 9d7421c..2695ff4 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -84,8 +84,10 @@ namespace OpenSim.Grid.UserServer
84 } 84 }
85 } 85 }
86 86
87 public void Startup() 87 public override void Startup()
88 { 88 {
89 base.Startup();
90
89 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 91 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
90 92
91 m_stats = StatsManager.StartCollectingUserStats(); 93 m_stats = StatsManager.StartCollectingUserStats();
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 72fdf10..9be30e9 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -83,12 +83,12 @@ namespace OpenSim
83 if (background) 83 if (background)
84 { 84 {
85 OpenSimBase sim = new OpenSimBackground(configSource); 85 OpenSimBase sim = new OpenSimBackground(configSource);
86 sim.StartUp(); 86 sim.Startup();
87 } 87 }
88 else 88 else
89 { 89 {
90 OpenSimBase sim = new OpenSim(configSource); 90 OpenSimBase sim = new OpenSim(configSource);
91 sim.StartUp(); 91 sim.Startup();
92 92
93 while (true) 93 while (true)
94 { 94 {
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1996182..b020a6c 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -80,7 +80,7 @@ namespace OpenSim
80 /// <summary> 80 /// <summary>
81 /// Performs initialisation of the scene, such as loading configuration from disk. 81 /// Performs initialisation of the scene, such as loading configuration from disk.
82 /// </summary> 82 /// </summary>
83 public override void StartUp() 83 public override void Startup()
84 { 84 {
85 m_log.Info("===================================================================="); 85 m_log.Info("====================================================================");
86 m_log.Info("========================= STARTING OPENSIM ========================="); 86 m_log.Info("========================= STARTING OPENSIM =========================");
@@ -90,7 +90,7 @@ namespace OpenSim
90 m_console = CreateConsole(); 90 m_console = CreateConsole();
91 MainConsole.Instance = m_console; 91 MainConsole.Instance = m_console;
92 92
93 base.StartUp(); 93 base.Startup();
94 94
95 //Run Startup Commands 95 //Run Startup Commands
96 if (m_startupCommandsFile != String.Empty) 96 if (m_startupCommandsFile != String.Empty)
diff --git a/OpenSim/Region/Application/OpenSimBackground.cs b/OpenSim/Region/Application/OpenSimBackground.cs
index dd618f0..51a5b67 100644
--- a/OpenSim/Region/Application/OpenSimBackground.cs
+++ b/OpenSim/Region/Application/OpenSimBackground.cs
@@ -48,7 +48,7 @@ namespace OpenSim
48 /// <summary> 48 /// <summary>
49 /// Performs initialisation of the scene, such as loading configuration from disk. 49 /// Performs initialisation of the scene, such as loading configuration from disk.
50 /// </summary> 50 /// </summary>
51 public override void StartUp() 51 public override void Startup()
52 { 52 {
53 // 53 //
54 // Called from app startup (OpenSim.Application) 54 // Called from app startup (OpenSim.Application)
@@ -58,7 +58,7 @@ namespace OpenSim
58 m_log.Info("===================================================================="); 58 m_log.Info("====================================================================");
59 m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid"); 59 m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid");
60 60
61 base.StartUp(); 61 base.Startup();
62 62
63 // We are done with startup 63 // We are done with startup
64 m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}", 64 m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 3e4db41..f96c29b 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -330,9 +330,9 @@ namespace OpenSim
330 /// <summary> 330 /// <summary>
331 /// Performs initialisation of the scene, such as loading configuration from disk. 331 /// Performs initialisation of the scene, such as loading configuration from disk.
332 /// </summary> 332 /// </summary>
333 public override void StartUp() 333 public override void Startup()
334 { 334 {
335 base.StartUp(); 335 base.Startup();
336 336
337 m_stats = StatsManager.StartCollectingSimExtraStats(); 337 m_stats = StatsManager.StartCollectingSimExtraStats();
338 338
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 19d14ad..d96336a 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -73,9 +73,9 @@ namespace OpenSim.Region.ClientStack
73 get { return m_sceneManager; } 73 get { return m_sceneManager; }
74 } 74 }
75 75
76 public override void StartUp() 76 public override void Startup()
77 { 77 {
78 base.StartUp(); 78 base.Startup();
79 79
80 LLClientView.TerrainManager = new TerrainManager(new SecondLife()); 80 LLClientView.TerrainManager = new TerrainManager(new SecondLife());
81 81
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 50257d6..eccaa78 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Environment.Scenes;
39 39
40namespace OpenSim.Region.Environment.Modules.World.Permissions 40namespace OpenSim.Region.Environment.Modules.World.Permissions
41{ 41{
42 public class PermissionsModule : IRegionModule, IScenePermissions, ICommandableModule 42 public class PermissionsModule : IRegionModule, ICommandableModule
43 { 43 {
44 protected Scene m_scene; 44 protected Scene m_scene;
45 private readonly Commander m_commander = new Commander("Permissions"); 45 private readonly Commander m_commander = new Commander("Permissions");
@@ -138,8 +138,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
138 138
139 m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); 139 m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
140 140
141 m_scene.RegisterModuleInterface<IScenePermissions>(this);
142
143 //Register functions with Scene External Checks! 141 //Register functions with Scene External Checks!
144 m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED 142 m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED
145 m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED 143 m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED