aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/Main.cs
diff options
context:
space:
mode:
authorgareth2007-03-14 03:34:49 +0000
committergareth2007-03-14 03:34:49 +0000
commit7a54467bed7e1da77f7e1a45ee01dfc709b5608d (patch)
treee0b575e4e87c4b127556597798186b7040d94b2a /src/Main.cs
parentMerged ogs-cs into trunk (diff)
downloadopensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.zip
opensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.tar.gz
opensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.tar.bz2
opensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.tar.xz
merged new OpenSim from branches/ogs-cs
Diffstat (limited to '')
-rw-r--r--src/Main.cs6
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 }