Reverting the texture sending patch and the new libOMV. This makes this

release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index b4ee069..7fd1c3b 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 OSD LLSDLoginMethod(OSD request)
+        public LLSD LLSDLoginMethod(LLSD request)
         {
             // Temporary fix
             m_loginMutex.WaitOne();
@@ -335,9 +335,9 @@ namespace OpenSim.Framework.Communications
                 UserProfileData userProfile = null;
                 LoginResponse logResponse = new LoginResponse();
 
-                if (request.Type == OSDType.Map)
+                if (request.Type == LLSDType.Map)
                 {
-                    OSDMap map = (OSDMap)request;
+                    LLSDMap map = (LLSDMap)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, OSD request)
+        public void CreateAgent(UserProfileData profile, LLSD request)
         {
             m_userManager.CreateAgent(profile, request);
         }