Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 2142f87..791e1ef 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -77,16 +77,16 @@ namespace OpenSim.Server.Base
             m_HttpServer = new BaseHttpServer(port);
 
             MainServer.Instance = m_HttpServer;
-
-            if (MainConsole.Instance is RemoteConsole)
-            {
-                ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
-            }
         }
 
         protected override void Initialise()
         {
             m_HttpServer.Start();
+
+            if (MainConsole.Instance is RemoteConsole)
+            {
+                ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
+            }
         }
     }
 }