1 files changed, 26 insertions, 0 deletions

diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 0bec2a1..0cb4976 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -38,6 +38,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
+using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.UserServer
 {
@@ -61,6 +62,8 @@ namespace OpenSim.Grid.UserServer
         public UserConfig m_config;
         private readonly IRegionProfileService m_regionProfileService;
 
+        protected BaseHttpServer m_httpServer;
+
         public UserLoginService(
             UserManagerBase userManager, IInterServiceInventoryServices inventoryService,
             LibraryRootFolder libraryRootFolder,
@@ -71,6 +74,29 @@ namespace OpenSim.Grid.UserServer
             m_inventoryService = inventoryService;
             m_regionProfileService = regionProfileService;
         }
+
+        public void RegisterHandlers(BaseHttpServer httpServer, bool registerLLSDHandler, bool registerOpenIDHandlers)
+        {
+            m_httpServer = httpServer;
+
+            m_httpServer.AddXmlRPCHandler("login_to_simulator", XmlRpcLoginMethod);
+            m_httpServer.AddHTTPHandler("login", ProcessHTMLLogin);
+            m_httpServer.AddXmlRPCHandler("set_login_params", XmlRPCSetLoginParams);
+
+            if (registerLLSDHandler)
+            {
+                m_httpServer.SetDefaultLLSDHandler(LLSDLoginMethod);
+            }
+
+            if (registerOpenIDHandlers)
+            {
+                // Handler for OpenID avatar identity pages
+                m_httpServer.AddStreamHandler(new OpenIdStreamHandler("GET", "/users/", this));
+                // Handlers for the OpenID endpoint server
+                m_httpServer.AddStreamHandler(new OpenIdStreamHandler("POST", "/openid/server/", this));
+                m_httpServer.AddStreamHandler(new OpenIdStreamHandler("GET", "/openid/server/", this));
+            }
+        }
         
         public  void  setloginlevel(int level)
         {