From 893a1824d075a6edfd40ac1ef2a7e4fc2fec968c Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 27 Mar 2007 18:27:11 +0000
Subject: * Introduced BaseHttpServer (doing nothing at the moment) * Removed
 OpenSimRoot dependencies from SimClient and AgentAssetUpload. 2 down, 7 left
 to go.

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

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

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 7425fca..a24d1fb 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -113,7 +113,7 @@ namespace OpenSim
             }
 
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
-            OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer();
+            OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenPort);
             OpenSimRoot.Instance.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin"));
 
             timer1.Enabled = true;
@@ -172,7 +172,7 @@ namespace OpenSim
             { // new client
                 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
                 this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
-                SimClient newuser = new SimClient(epSender, useCircuit);
+                SimClient newuser = new SimClient(epSender, useCircuit, OpenSimRoot.Instance.LocalWorld, OpenSimRoot.Instance.ClientThreads, OpenSimRoot.Instance.AssetCache, OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Application, OpenSimRoot.Instance.InventoryCache, OpenSimRoot.Instance.Sandbox);
                 //OpenSimRoot.Instance.ClientThreads.Add(epSender, newuser);
                 OpenSimRoot.Instance.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
             }
-- 
cgit v1.1