From 7f03246653a6f277505d2055528cbb8dd2e1f4c1 Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 10 Jul 2007 17:56:31 +0000
Subject: Gird mode in sugilite should now work in so far as you should be able
 to login and move between regions in the same instance. Moving to regions in
 a different instance of opensim still needs implementing (working on it now).
 Also trying to look at the map in grid mode will crash the server.

---
 OpenSim/Region/Application/OpenSimMain.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Application')

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 949c369..728329e 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -93,17 +93,17 @@ namespace OpenSim
 
             ClientView.TerrainManager = new TerrainManager(new SecondLife());
 
+            this.SetupHttpListener();
+
             if (m_sandbox)
             {
                 this.SetupLocalGridServers();
                 //  this.checkServer = new CheckSumServer(12036);
                 // this.checkServer.ServerListener();
-                this.commsManager = new CommunicationsLocal(this.serversData);
             }
             else
             {
                 this.SetupRemoteGridServers();
-                this.commsManager = new CommunicationsOGS1(this.serversData);
             }
 
             startuptime = DateTime.Now;
@@ -111,14 +111,10 @@ namespace OpenSim
             this.physManager = new PhysicsManager();
             this.physManager.LoadPlugins();
 
-            this.SetupHttpListener();
-
             this.SetupWorld();
 
             m_log.Verbose("Main.cs:Startup() - Initialising HTTP server");
 
-
-
             if (m_sandbox)
             {
                 httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
@@ -143,6 +139,7 @@ namespace OpenSim
             {
                 AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
                 InventoryCache = new InventoryCache();
+                this.commsManager = new CommunicationsLocal(this.serversData, httpServer);
             }
             catch (Exception e)
             {
@@ -156,8 +153,9 @@ namespace OpenSim
         {
             try
             {
-                AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+                AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
                 InventoryCache = new InventoryCache();
+                this.commsManager = new CommunicationsOGS1(this.serversData, httpServer);
             }
             catch (Exception e)
             {
-- 
cgit v1.1