diff options
author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Framework/Communications/LoginService.cs | |
parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
download | opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz |
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
Diffstat (limited to 'OpenSim/Framework/Communications/LoginService.cs')
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 8 |
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 | |||
321 | /// </summary> | 321 | /// </summary> |
322 | /// <param name="request">The LLSD request</param> | 322 | /// <param name="request">The LLSD request</param> |
323 | /// <returns>The response to send</returns> | 323 | /// <returns>The response to send</returns> |
324 | public OSD LLSDLoginMethod(OSD request) | 324 | public LLSD LLSDLoginMethod(LLSD request) |
325 | { | 325 | { |
326 | // Temporary fix | 326 | // Temporary fix |
327 | m_loginMutex.WaitOne(); | 327 | m_loginMutex.WaitOne(); |
@@ -335,9 +335,9 @@ namespace OpenSim.Framework.Communications | |||
335 | UserProfileData userProfile = null; | 335 | UserProfileData userProfile = null; |
336 | LoginResponse logResponse = new LoginResponse(); | 336 | LoginResponse logResponse = new LoginResponse(); |
337 | 337 | ||
338 | if (request.Type == OSDType.Map) | 338 | if (request.Type == LLSDType.Map) |
339 | { | 339 | { |
340 | OSDMap map = (OSDMap)request; | 340 | LLSDMap map = (LLSDMap)request; |
341 | 341 | ||
342 | if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd")) | 342 | if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd")) |
343 | { | 343 | { |
@@ -749,7 +749,7 @@ namespace OpenSim.Framework.Communications | |||
749 | m_userManager.CreateAgent(profile, request); | 749 | m_userManager.CreateAgent(profile, request); |
750 | } | 750 | } |
751 | 751 | ||
752 | public void CreateAgent(UserProfileData profile, OSD request) | 752 | public void CreateAgent(UserProfileData profile, LLSD request) |
753 | { | 753 | { |
754 | m_userManager.CreateAgent(profile, request); | 754 | m_userManager.CreateAgent(profile, request); |
755 | } | 755 | } |