merged new OpenSim from branches/ogs-cs

1 files changed, 5 insertions, 1 deletions

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();

 

                 }