From 7e136c67fd89f6c559420093acdee867967773bb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 21 Aug 2019 21:15:58 +0100
Subject: Call SetServer on consoles reflectively to avoid having type checks
 in places where it tends to be forgotten to update them.

---
 OpenSim/Server/Base/HttpServerBase.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 OpenSim/Server/Base/HttpServerBase.cs

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
old mode 100644
new mode 100755
index 3357250..5e76156
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -149,12 +149,14 @@ namespace OpenSim.Server.Base
 
             MainServer.RegisterHttpConsoleCommands(MainConsole.Instance);
 
-            if (MainConsole.Instance is RemoteConsole)
+            MethodInfo mi = m_console.GetType().GetMethod("SetServer", BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(BaseHttpServer) }, null);
+
+            if (mi != null)
             {
                 if (m_consolePort == 0)
-                    ((RemoteConsole)MainConsole.Instance).SetServer(MainServer.Instance);
+                    mi.Invoke(MainConsole.Instance, new object[] { MainServer.Instance });
                 else
-                    ((RemoteConsole)MainConsole.Instance).SetServer(MainServer.GetHttpServer(m_consolePort));
+                    mi.Invoke(MainConsole.Instance, new object[] { MainServer.GetHttpServer(m_consolePort) });
             }
         }
     }
-- 
cgit v1.1