diff options
Diffstat (limited to 'OpenSim/OpenSim/OpenSimMain.cs')
-rw-r--r-- | OpenSim/OpenSim/OpenSimMain.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs index 0d177b9..b419101 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSim/OpenSimMain.cs | |||
@@ -180,7 +180,7 @@ namespace OpenSim | |||
180 | protected override void SetupWorld() | 180 | protected override void SetupWorld() |
181 | { | 181 | { |
182 | IGenericConfig regionConfig; | 182 | IGenericConfig regionConfig; |
183 | World LocalWorld; | 183 | Scene LocalWorld; |
184 | UDPServer udpServer; | 184 | UDPServer udpServer; |
185 | RegionInfo regionDat = new RegionInfo(); | 185 | RegionInfo regionDat = new RegionInfo(); |
186 | AuthenticateSessionsBase authenBase; | 186 | AuthenticateSessionsBase authenBase; |
@@ -234,7 +234,7 @@ namespace OpenSim | |||
234 | m_console.componentname = "Region " + regionData.RegionName; | 234 | m_console.componentname = "Region " + regionData.RegionName; |
235 | */ | 235 | */ |
236 | 236 | ||
237 | LocalWorld = new World(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager); | 237 | LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager); |
238 | this.m_localWorld.Add(LocalWorld); | 238 | this.m_localWorld.Add(LocalWorld); |
239 | //LocalWorld.InventoryCache = InventoryCache; | 239 | //LocalWorld.InventoryCache = InventoryCache; |
240 | //LocalWorld.AssetCache = AssetCache; | 240 | //LocalWorld.AssetCache = AssetCache; |
@@ -392,7 +392,7 @@ namespace OpenSim | |||
392 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating"); | 392 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating"); |
393 | for (int i = 0; i < m_localWorld.Count; i++) | 393 | for (int i = 0; i < m_localWorld.Count; i++) |
394 | { | 394 | { |
395 | ((World)m_localWorld[i]).Close(); | 395 | ((Scene)m_localWorld[i]).Close(); |
396 | } | 396 | } |
397 | m_console.Close(); | 397 | m_console.Close(); |
398 | Environment.Exit(0); | 398 | Environment.Exit(0); |