1 files changed, 6 insertions, 1 deletions

diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 13c5752..303ce64 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -559,7 +559,8 @@ namespace OpenSim.Framework.Servers
 
             foreach (string pattern in m_llsdHandlers.Keys)
             {
-                if (searchquery.StartsWith(searchquery))
+                
+                if (pattern.StartsWith(searchquery) && searchquery.Length >= pattern.Length)
                 {
                     if (String.IsNullOrEmpty(bestMatch) || searchquery.Length > bestMatch.Length)
                     {
@@ -568,6 +569,10 @@ namespace OpenSim.Framework.Servers
                 }
             }
 
+            // extra kicker to remove the default XMLRPC login case..  just in case..  
+            if (path == "/")
+                return false;
+
             if (String.IsNullOrEmpty(bestMatch))
             {