From 6056247ac3002808c95d7a1c6671c388920ec2ed Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Wed, 16 May 2007 17:12:17 +0000
Subject: * removed unused new-login.dat * cleared up
 verbose/noverbose/disableOutput douple negation confusion in ConsoleBase * 2d
 chat radius is now 3d chat sphere * removed unused fast 2d radius calc *
 added chat type 0xFF : broadcast (no sphere checking) * OpenSimMain now
 exposes its LocalWorld

---
 OpenSim.RegionServer/OpenSimMain.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'OpenSim.RegionServer/OpenSimMain.cs')

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index ce49074..6b89bfe 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -60,7 +60,6 @@ namespace OpenSim
         //private IGenericConfig remoteConfig;
         private PhysicsManager physManager;
         private Grid GridServers;
-        private World LocalWorld;
         private AssetCache AssetCache;
         private InventoryCache InventoryCache;
         private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
@@ -81,7 +80,7 @@ namespace OpenSim
 
         protected ConsoleBase m_console;
 
-        public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool verbose, string configFile)
+        public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
         {
             this.configFileSetup = useConfigFile;
             m_sandbox = sandBoxMode;
@@ -89,10 +88,16 @@ namespace OpenSim
             m_physicsEngine = physicsEngine;
             m_config = configFile;
 
-            m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, verbose);
+            m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, silent);
             OpenSim.Framework.Console.MainConsole.Instance = m_console;
         }
 
+        private World m_localWorld;
+        public World LocalWorld
+        {
+            get { return m_localWorld; }
+        }
+
         /// <summary>
         /// Performs initialisation of the world, such as loading configuration from disk.
         /// </summary>
@@ -251,7 +256,7 @@ namespace OpenSim
             m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world");
             m_console.componentname = "Region " + regionData.RegionName;
 
-            LocalWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);
+            m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);
             LocalWorld.InventoryCache = InventoryCache;
             LocalWorld.AssetCache = AssetCache;
 
-- 
cgit v1.1