diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 4 |
3 files changed, 7 insertions, 6 deletions
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(); |