diff options
Diffstat (limited to 'src/Main.cs')
-rw-r--r-- | src/Main.cs | 6 |
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 | |||
56 | public static SimConfig cfg; | 56 | public static SimConfig cfg; |
57 | public static World local_world; | 57 | public static World local_world; |
58 | public static Grid gridServers; | 58 | public static Grid gridServers; |
59 | 59 | public static SimCAPSHTTPServer http_server; | |
60 | |||
60 | public static Socket Server; | 61 | public static Socket Server; |
61 | private static IPEndPoint ServerIncoming; | 62 | private static IPEndPoint ServerIncoming; |
62 | private static byte[] RecvBuffer = new byte[4096]; | 63 | private static byte[] RecvBuffer = new byte[4096]; |
@@ -169,6 +170,9 @@ namespace OpenSim | |||
169 | local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded. | 170 | local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded. |
170 | local_world.LoadPrimsFromStorage(); | 171 | local_world.LoadPrimsFromStorage(); |
171 | 172 | ||
173 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); | ||
174 | http_server = new SimCAPSHTTPServer(); | ||
175 | |||
172 | MainServerListener(); | 176 | MainServerListener(); |
173 | 177 | ||
174 | } | 178 | } |