1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 905bf81..a04b5ef 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -120,7 +120,10 @@ namespace OpenSim.Grid.UserServer
 
             m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin);
 
-            m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod);
+            if (Cfg.EnableLLSDLogin)
+            {
+                m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod);
+            }
 
             m_httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
             m_httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID);