diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Services')
-rw-r--r-- | OpenSim/Framework/Communications/Services/HGLoginAuthService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Services/LoginService.cs | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs index 3756cf5..1de0d4d 100644 --- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs +++ b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs | |||
@@ -259,7 +259,7 @@ namespace OpenSim.Framework.Communications.Services | |||
259 | /// <param name="user"></param> | 259 | /// <param name="user"></param> |
260 | /// <param name="response"></param> | 260 | /// <param name="response"></param> |
261 | /// <returns>true if the region was successfully contacted, false otherwise</returns> | 261 | /// <returns>true if the region was successfully contacted, false otherwise</returns> |
262 | protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response) | 262 | protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient) |
263 | { | 263 | { |
264 | IPEndPoint endPoint = regionInfo.ExternalEndPoint; | 264 | IPEndPoint endPoint = regionInfo.ExternalEndPoint; |
265 | response.SimAddress = endPoint.Address.ToString(); | 265 | response.SimAddress = endPoint.Address.ToString(); |
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs index 6859827..68a1819 100644 --- a/OpenSim/Framework/Communications/Services/LoginService.cs +++ b/OpenSim/Framework/Communications/Services/LoginService.cs | |||
@@ -256,7 +256,7 @@ namespace OpenSim.Framework.Communications.Services | |||
256 | logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID)); | 256 | logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID)); |
257 | logResponse.StartLocation = startLocationRequest; | 257 | logResponse.StartLocation = startLocationRequest; |
258 | 258 | ||
259 | if (CustomiseResponse(logResponse, userProfile, startLocationRequest)) | 259 | if (CustomiseResponse(logResponse, userProfile, startLocationRequest, remoteClient)) |
260 | { | 260 | { |
261 | userProfile.LastLogin = userProfile.CurrentAgent.LoginTime; | 261 | userProfile.LastLogin = userProfile.CurrentAgent.LoginTime; |
262 | CommitAgent(ref userProfile); | 262 | CommitAgent(ref userProfile); |
@@ -351,7 +351,7 @@ namespace OpenSim.Framework.Communications.Services | |||
351 | /// </summary> | 351 | /// </summary> |
352 | /// <param name="request">The LLSD request</param> | 352 | /// <param name="request">The LLSD request</param> |
353 | /// <returns>The response to send</returns> | 353 | /// <returns>The response to send</returns> |
354 | public OSD LLSDLoginMethod(OSD request) | 354 | public OSD LLSDLoginMethod(OSD request, IPEndPoint remoteClient) |
355 | { | 355 | { |
356 | // Temporary fix | 356 | // Temporary fix |
357 | m_loginMutex.WaitOne(); | 357 | m_loginMutex.WaitOne(); |
@@ -486,7 +486,7 @@ namespace OpenSim.Framework.Communications.Services | |||
486 | 486 | ||
487 | try | 487 | try |
488 | { | 488 | { |
489 | CustomiseResponse(logResponse, userProfile, startLocationRequest); | 489 | CustomiseResponse(logResponse, userProfile, startLocationRequest, remoteClient); |
490 | } | 490 | } |
491 | catch (Exception ex) | 491 | catch (Exception ex) |
492 | { | 492 | { |
@@ -891,7 +891,7 @@ namespace OpenSim.Framework.Communications.Services | |||
891 | /// <param name="theUser">The user profile</param> | 891 | /// <param name="theUser">The user profile</param> |
892 | /// <param name="startLocationRequest">The requested start location</param> | 892 | /// <param name="startLocationRequest">The requested start location</param> |
893 | /// <returns>true on success, false if the region was not successfully told to expect a user connection</returns> | 893 | /// <returns>true on success, false if the region was not successfully told to expect a user connection</returns> |
894 | public bool CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest) | 894 | public bool CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest, IPEndPoint client) |
895 | { | 895 | { |
896 | // add active gestures to login-response | 896 | // add active gestures to login-response |
897 | AddActiveGestures(response, theUser); | 897 | AddActiveGestures(response, theUser); |
@@ -984,7 +984,7 @@ namespace OpenSim.Framework.Communications.Services | |||
984 | response.StartLocation = "url"; | 984 | response.StartLocation = "url"; |
985 | } | 985 | } |
986 | 986 | ||
987 | if ((regionInfo != null) && (PrepareLoginToRegion(regionInfo, theUser, response))) | 987 | if ((regionInfo != null) && (PrepareLoginToRegion(regionInfo, theUser, response, client))) |
988 | { | 988 | { |
989 | return true; | 989 | return true; |
990 | } | 990 | } |
@@ -1015,13 +1015,13 @@ namespace OpenSim.Framework.Communications.Services | |||
1015 | theUser.CurrentAgent.Position = new Vector3(128, 128, 0); | 1015 | theUser.CurrentAgent.Position = new Vector3(128, 128, 0); |
1016 | response.StartLocation = "safe"; | 1016 | response.StartLocation = "safe"; |
1017 | 1017 | ||
1018 | return PrepareLoginToRegion(regionInfo, theUser, response); | 1018 | return PrepareLoginToRegion(regionInfo, theUser, response, client); |
1019 | } | 1019 | } |
1020 | 1020 | ||
1021 | protected abstract RegionInfo RequestClosestRegion(string region); | 1021 | protected abstract RegionInfo RequestClosestRegion(string region); |
1022 | protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle); | 1022 | protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle); |
1023 | protected abstract RegionInfo GetRegionInfo(UUID homeRegionId); | 1023 | protected abstract RegionInfo GetRegionInfo(UUID homeRegionId); |
1024 | protected abstract bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response); | 1024 | protected abstract bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint client); |
1025 | 1025 | ||
1026 | /// <summary> | 1026 | /// <summary> |
1027 | /// Add active gestures of the user to the login response. | 1027 | /// Add active gestures of the user to the login response. |