diff options
| author | John Hurliman | 2010-04-14 11:06:07 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-04-14 11:06:07 -0700 |
| commit | 985faf415106a068bf59ccb2bc0bacfc8d705e90 (patch) | |
| tree | f3e460cce48fff6082579610238140c290c7ab4d /OpenSim/Server/ServerMain.cs | |
| parent | Applying a patch from lkalif to fix a small bug in the previous patch (diff) | |
| parent | * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine. (diff) | |
| download | opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.zip opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.tar.gz opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.tar.bz2 opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/ServerMain.cs')
| -rw-r--r-- | OpenSim/Server/ServerMain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 10cd9c5..d3e65a4 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
| @@ -47,7 +47,7 @@ namespace OpenSim.Server | |||
| 47 | protected static List<IServiceConnector> m_ServiceConnectors = | 47 | protected static List<IServiceConnector> m_ServiceConnectors = |
| 48 | new List<IServiceConnector>(); | 48 | new List<IServiceConnector>(); |
| 49 | 49 | ||
| 50 | static int Main(string[] args) | 50 | public static int Main(string[] args) |
| 51 | { | 51 | { |
| 52 | m_Server = new HttpServerBase("R.O.B.U.S.T.", args); | 52 | m_Server = new HttpServerBase("R.O.B.U.S.T.", args); |
| 53 | 53 | ||