From 70124a3213d013098507b08ed7f9301da6845882 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 3 Oct 2008 15:11:29 +0000 Subject: * refactor: make startup a template method --- OpenSim/Region/Application/OpenSimBase.cs | 6 +++--- OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 3 +++ OpenSim/Region/ClientStack/RegionApplicationBase.cs | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region') 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 /// /// Performs initialisation of the scene, such as loading configuration from disk. /// - public override void Startup() + protected override void StartupSpecific() { - base.Startup(); - + base.StartupSpecific(); + m_stats = StatsManager.StartCollectingSimExtraStats(); 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 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + /// + /// Is throttling enabled at all? + /// private bool m_enabled = true; private OpenSim.Framework.BlockingQueue 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 get { return m_sceneManager; } } - public override void Startup() + protected override void StartupSpecific() { - base.Startup(); - m_storageManager = CreateStorageManager(m_storageConnectionString, m_estateConnectionString); m_clientStackManager = CreateClientStackManager(); -- cgit v1.1