2 files changed, 9 insertions, 0 deletions

diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index dc12cf9..6b5c259 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -76,6 +76,10 @@ namespace OpenSim.Server.Base
             }
 
             m_HttpServer = new BaseHttpServer(port);
+            if (MainConsole.Instance is RemoteConsole)
+            {
+                ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
+            }
         }
 
         protected override void Initialise()
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 5350bce..0de6c4a 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -145,6 +145,11 @@ namespace OpenSim.Server.Base
             {
                 MainConsole.Instance = new CommandConsole(prompt);
             }
+            else if (consoleType == "rest")
+            {
+                MainConsole.Instance = new RemoteConsole(prompt);
+                ((RemoteConsole)MainConsole.Instance).ReadConfig(Config);
+            }
             else
             {
                 MainConsole.Instance = new LocalConsole(prompt);