aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/OpenSimMain.cs
diff options
context:
space:
mode:
authorlbsa712007-05-16 17:12:17 +0000
committerlbsa712007-05-16 17:12:17 +0000
commit6056247ac3002808c95d7a1c6671c388920ec2ed (patch)
treecc9c6aa96868ba71dab8cee92f904b51315156c9 /OpenSim.RegionServer/OpenSimMain.cs
parentYet more cleanup/refactoring (diff)
downloadopensim-SC_OLD-6056247ac3002808c95d7a1c6671c388920ec2ed.zip
opensim-SC_OLD-6056247ac3002808c95d7a1c6671c388920ec2ed.tar.gz
opensim-SC_OLD-6056247ac3002808c95d7a1c6671c388920ec2ed.tar.bz2
opensim-SC_OLD-6056247ac3002808c95d7a1c6671c388920ec2ed.tar.xz
* 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
Diffstat (limited to 'OpenSim.RegionServer/OpenSimMain.cs')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs13
1 files changed, 9 insertions, 4 deletions
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
60 //private IGenericConfig remoteConfig; 60 //private IGenericConfig remoteConfig;
61 private PhysicsManager physManager; 61 private PhysicsManager physManager;
62 private Grid GridServers; 62 private Grid GridServers;
63 private World LocalWorld;
64 private AssetCache AssetCache; 63 private AssetCache AssetCache;
65 private InventoryCache InventoryCache; 64 private InventoryCache InventoryCache;
66 private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); 65 private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
@@ -81,7 +80,7 @@ namespace OpenSim
81 80
82 protected ConsoleBase m_console; 81 protected ConsoleBase m_console;
83 82
84 public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool verbose, string configFile) 83 public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
85 { 84 {
86 this.configFileSetup = useConfigFile; 85 this.configFileSetup = useConfigFile;
87 m_sandbox = sandBoxMode; 86 m_sandbox = sandBoxMode;
@@ -89,10 +88,16 @@ namespace OpenSim
89 m_physicsEngine = physicsEngine; 88 m_physicsEngine = physicsEngine;
90 m_config = configFile; 89 m_config = configFile;
91 90
92 m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, verbose); 91 m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, silent);
93 OpenSim.Framework.Console.MainConsole.Instance = m_console; 92 OpenSim.Framework.Console.MainConsole.Instance = m_console;
94 } 93 }
95 94
95 private World m_localWorld;
96 public World LocalWorld
97 {
98 get { return m_localWorld; }
99 }
100
96 /// <summary> 101 /// <summary>
97 /// Performs initialisation of the world, such as loading configuration from disk. 102 /// Performs initialisation of the world, such as loading configuration from disk.
98 /// </summary> 103 /// </summary>
@@ -251,7 +256,7 @@ namespace OpenSim
251 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world"); 256 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world");
252 m_console.componentname = "Region " + regionData.RegionName; 257 m_console.componentname = "Region " + regionData.RegionName;
253 258
254 LocalWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName); 259 m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);
255 LocalWorld.InventoryCache = InventoryCache; 260 LocalWorld.InventoryCache = InventoryCache;
256 LocalWorld.AssetCache = AssetCache; 261 LocalWorld.AssetCache = AssetCache;
257 262