From 691f1e8aa08db84b689793ea9cd2c72bcfdd9b17 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 29 Sep 2009 09:56:17 +0100
Subject: Fix loading modules with alternate configurations and ports into
 ROBUST. Make all current modules support the configuration name option

---
 OpenSim/Server/Base/HttpServerBase.cs | 10 +++++++++-
 OpenSim/Server/Base/ServerUtils.cs    |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Server/Base')

diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 6a1f37c..ed0210f 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Server.Base
     {
         // Logger
         //
-        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 
+        private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 
 
         // The http server instance
         //
@@ -55,8 +55,14 @@ namespace OpenSim.Server.Base
             get { return m_HttpServer; }
         }
 
+        public uint DefaultPort
+        {
+            get { return m_Port; }
+        }
+
         public IHttpServer GetHttpServer(uint port)
         {
+            m_Log.InfoFormat("[SERVER]: Requested port {0}", port);
             if (port == m_Port)
                 return HttpServer;
 
@@ -64,6 +70,8 @@ namespace OpenSim.Server.Base
                 return m_Servers[port];
 
             m_Servers[port] = new BaseHttpServer(port);
+            m_Servers[port].Start();
+
             return m_Servers[port];
         }
 
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 656fcf5..2340645 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -141,7 +141,9 @@ namespace OpenSim.Server.Base
                             }
                             catch (Exception e)
                             {
-                                m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
+                                if (!(e is System.MissingMethodException))
+                                    m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
+                                return null;
                             }
 
                             return plug;
-- 
cgit v1.1