aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs11
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs4
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs4
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs6
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs3
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs4
9 files changed, 21 insertions, 25 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index e799c23..099060a 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -94,6 +94,11 @@ namespace OpenSim.Framework.Servers
94 Thread.CurrentThread.Name = "ConsoleThread"; 94 Thread.CurrentThread.Name = "ConsoleThread";
95 ThreadTracker.Add(Thread.CurrentThread); 95 ThreadTracker.Add(Thread.CurrentThread);
96 } 96 }
97
98 /// <summary>
99 /// Must be overriden by child classes for their own server specific startup behaviour.
100 /// </summary>
101 protected abstract void StartupSpecific();
97 102
98 /// <summary> 103 /// <summary>
99 /// Print statistics to the logfile, if they are active 104 /// Print statistics to the logfile, if they are active
@@ -202,11 +207,13 @@ namespace OpenSim.Framework.Servers
202 /// </summary> 207 /// </summary>
203 public virtual void Startup() 208 public virtual void Startup()
204 { 209 {
205 m_log.Info("[STARTUP]: Beginning startup processing"); 210 m_log.Info("[STARTUP]: Beginning startup processing");
206 211
207 EnhanceVersionInformation(); 212 EnhanceVersionInformation();
208 213
209 m_log.Info("[STARTUP]: Version: " + m_version + "\n"); 214 m_log.Info("[STARTUP]: Version: " + m_version + "\n");
215
216 StartupSpecific();
210 } 217 }
211 218
212 /// <summary> 219 /// <summary>
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 3f85691..1c9275b 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -80,10 +80,8 @@ namespace OpenSim.Grid.AssetServer
80 MainConsole.Instance = m_console; 80 MainConsole.Instance = m_console;
81 } 81 }
82 82
83 public override void Startup() 83 protected override void StartupSpecific()
84 { 84 {
85 base.Startup();
86
87 AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml"))); 85 AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
88 86
89 m_log.Info("[ASSET]: Setting up asset DB"); 87 m_log.Info("[ASSET]: Setting up asset DB");
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index d83027a..5067a8c 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -73,10 +73,8 @@ namespace OpenSim.Grid.GridServer
73 } 73 }
74 } 74 }
75 75
76 public override void Startup() 76 protected override void StartupSpecific()
77 { 77 {
78 base.Startup();
79
80 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml"))); 78 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
81 79
82 SetupGridManager(); 80 SetupGridManager();
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 3b990e7..8be6a23 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -62,10 +62,8 @@ namespace OpenSim.Grid.InventoryServer
62 MainConsole.Instance = m_console; 62 MainConsole.Instance = m_console;
63 } 63 }
64 64
65 public override void Startup() 65 protected override void StartupSpecific()
66 { 66 {
67 base.Startup();
68
69 InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); 67 InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
70 68
71 m_inventoryService = new GridInventoryService(config.UserServerURL); 69 m_inventoryService = new GridInventoryService(config.UserServerURL);
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index c64c74e..27b9346 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -56,8 +56,6 @@ namespace OpenSim.Grid.MessagingServer
56 56
57 m_log.Info("Launching MessagingServer..."); 57 m_log.Info("Launching MessagingServer...");
58 58
59
60
61 OpenMessage_Main messageserver = new OpenMessage_Main(); 59 OpenMessage_Main messageserver = new OpenMessage_Main();
62 60
63 messageserver.Startup(); 61 messageserver.Startup();
@@ -80,10 +78,8 @@ namespace OpenSim.Grid.MessagingServer
80 } 78 }
81 } 79 }
82 80
83 public override void Startup() 81 protected override void StartupSpecific()
84 { 82 {
85 base.Startup();
86
87 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); 83 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
88 84
89 m_log.Info("[REGION]: Starting HTTP process"); 85 m_log.Info("[REGION]: Starting HTTP process");
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index d3d5c8c..23df830 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -88,10 +88,8 @@ namespace OpenSim.Grid.UserServer
88 } 88 }
89 } 89 }
90 90
91 public override void Startup() 91 protected override void StartupSpecific()
92 { 92 {
93 base.Startup();
94
95 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 93 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
96 94
97 m_stats = StatsManager.StartCollectingUserStats(); 95 m_stats = StatsManager.StartCollectingUserStats();
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 445fba0..b802308 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -363,10 +363,10 @@ namespace OpenSim
363 /// <summary> 363 /// <summary>
364 /// Performs initialisation of the scene, such as loading configuration from disk. 364 /// Performs initialisation of the scene, such as loading configuration from disk.
365 /// </summary> 365 /// </summary>
366 public override void Startup() 366 protected override void StartupSpecific()
367 { 367 {
368 base.Startup(); 368 base.StartupSpecific();
369 369
370 m_stats = StatsManager.StartCollectingSimExtraStats(); 370 m_stats = StatsManager.StartCollectingSimExtraStats();
371 371
372 LibraryRootFolder libraryRootFolder = new LibraryRootFolder(); 372 LibraryRootFolder libraryRootFolder = new LibraryRootFolder();
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 39ade56..e4e5e9a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -44,6 +44,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
44 private static readonly log4net.ILog m_log 44 private static readonly log4net.ILog m_log
45 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 /// <summary>
48 /// Is throttling enabled at all?
49 /// </summary>
47 private bool m_enabled = true; 50 private bool m_enabled = true;
48 51
49 private OpenSim.Framework.BlockingQueue<LLQueItem> SendQueue; 52 private OpenSim.Framework.BlockingQueue<LLQueItem> SendQueue;
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 4c6d51f..cee7ffa 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -71,10 +71,8 @@ namespace OpenSim.Region.ClientStack
71 get { return m_sceneManager; } 71 get { return m_sceneManager; }
72 } 72 }
73 73
74 public override void Startup() 74 protected override void StartupSpecific()
75 { 75 {
76 base.Startup();
77
78 m_storageManager = CreateStorageManager(m_storageConnectionString, m_estateConnectionString); 76 m_storageManager = CreateStorageManager(m_storageConnectionString, m_estateConnectionString);
79 77
80 m_clientStackManager = CreateClientStackManager(); 78 m_clientStackManager = CreateClientStackManager();