2 files changed, 47 insertions, 12 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index ebf7ded..5c3cad4 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -319,18 +319,21 @@ namespace OpenSim.Framework.Servers
                 return;
             }
       
-            string rawLevel = cmd[3];
-            
-            ILoggerRepository repository = LogManager.GetRepository();
-            Level consoleLevel = repository.LevelMap[rawLevel];
-            
-            if (consoleLevel != null)
-                m_consoleAppender.Threshold = consoleLevel;
-            else
-                Notice(
-                    String.Format(
-                        "{0} is not a valid logging level.  Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF",
-                        rawLevel));
+            if (cmd.Length > 3)
+            {
+                string rawLevel = cmd[3];
+                
+                ILoggerRepository repository = LogManager.GetRepository();
+                Level consoleLevel = repository.LevelMap[rawLevel];
+                
+                if (consoleLevel != null)
+                    m_consoleAppender.Threshold = consoleLevel;
+                else
+                    Notice(
+                        String.Format(
+                            "{0} is not a valid logging level.  Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF",
+                            rawLevel));
+            }
 
             Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index d4ee7ba..4c35132 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -143,6 +143,11 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
+        public List<string>  GetStreamHandlerKeys()
+        {
+            return new List<string>(m_streamHandlers.Keys);
+        }
+
         private static string GetHandlerKey(string httpMethod, string path)
         {
             return httpMethod + ":" + path;
@@ -179,6 +184,11 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
+        public List<string> GetXmlRpcHandlerKeys()
+        {
+            return new List<string>(m_rpcHandlers.Keys);
+        }
+
         public bool AddHTTPHandler(string methodName, GenericHTTPMethod handler)
         {
             //m_log.DebugFormat("[BASE HTTP SERVER]: Registering {0}", methodName);
@@ -196,6 +206,12 @@ namespace OpenSim.Framework.Servers.HttpServer
             return false;
         }
 
+        public List<string> GetHTTPHandlerKeys()
+        {
+            return new List<string>(m_HTTPHandlers.Keys);
+        }
+
+
         public bool AddPollServiceHTTPHandler(string methodName, GenericHTTPMethod handler, PollServiceEventArgs args)
         {
             bool pollHandlerResult = false;
@@ -214,6 +230,12 @@ namespace OpenSim.Framework.Servers.HttpServer
             return false;
         }
 
+        public List<string> GetPollServiceHandlerKeys()
+        {
+            return new List<string>(m_pollHandlers.Keys);
+        }
+
+
         // Note that the agent string is provided simply to differentiate
         // the handlers - it is NOT required to be an actual agent header
         // value.
@@ -232,6 +254,11 @@ namespace OpenSim.Framework.Servers.HttpServer
             return false;
         }
 
+        public List<string> GetAgentHandlerKeys()
+        {
+            return new List<string>(m_agentHandlers.Keys);
+        }
+
         public bool AddLLSDHandler(string path, LLSDMethod handler)
         {
             lock (m_llsdHandlers)
@@ -245,6 +272,11 @@ namespace OpenSim.Framework.Servers.HttpServer
             return false;
         }
 
+        public List<string> GetLLSDHandlerKeys()
+        {
+            return new List<string>(m_llsdHandlers.Keys);
+        }
+
         public bool SetDefaultLLSDHandler(DefaultLLSDMethod handler)
         {
             m_defaultLlsdHandler = handler;