From 7a54467bed7e1da77f7e1a45ee01dfc709b5608d Mon Sep 17 00:00:00 2001
From: gareth
Date: Wed, 14 Mar 2007 03:34:49 +0000
Subject: merged new OpenSim from branches/ogs-cs

---
 src/Main.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/Main.cs')

diff --git a/src/Main.cs b/src/Main.cs
index 79c0782..506f87b 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -56,7 +56,8 @@ namespace OpenSim
 		public static SimConfig cfg;
 		public static World local_world;
 		public static Grid gridServers;
-		
+		public static SimCAPSHTTPServer http_server;
+	
 		public static Socket Server;
 		private static IPEndPoint ServerIncoming;
 		private static byte[] RecvBuffer = new byte[4096];
@@ -169,6 +170,9 @@ namespace OpenSim
 			local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded.
 			local_world.LoadPrimsFromStorage();
 			
+			ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
+			http_server = new SimCAPSHTTPServer();
+
 			MainServerListener();
 
 		}
-- 
cgit v1.1