Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new

libOMV.

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 7fd1c3b..b4ee069 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -321,7 +321,7 @@ namespace OpenSim.Framework.Communications
         /// </summary>
         /// <param name="request">The LLSD request</param>
         /// <returns>The response to send</returns>
-        public LLSD LLSDLoginMethod(LLSD request)
+        public OSD LLSDLoginMethod(OSD request)
         {
             // Temporary fix
             m_loginMutex.WaitOne();
@@ -335,9 +335,9 @@ namespace OpenSim.Framework.Communications
                 UserProfileData userProfile = null;
                 LoginResponse logResponse = new LoginResponse();
 
-                if (request.Type == LLSDType.Map)
+                if (request.Type == OSDType.Map)
                 {
-                    LLSDMap map = (LLSDMap)request;
+                    OSDMap map = (OSDMap)request;
 
                     if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd"))
                     {
@@ -749,7 +749,7 @@ namespace OpenSim.Framework.Communications
             m_userManager.CreateAgent(profile, request);
         }
 
-        public void CreateAgent(UserProfileData profile, LLSD request)
+        public void CreateAgent(UserProfileData profile, OSD request)
         {
             m_userManager.CreateAgent(profile, request);
         }