aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-07 05:07:57 +0000
committerJustin Clarke Casey2008-09-07 05:07:57 +0000
commit815278531ab578dc5c4fbfefb71c6b458c201571 (patch)
treed467b4222462e8d590d9cdf47268a016bfddac83 /OpenSim/Region/Communications/Local
parent* refactor: Remove duplication in UserLoginService where most of the emergenc... (diff)
downloadopensim-SC-815278531ab578dc5c4fbfefb71c6b458c201571.zip
opensim-SC-815278531ab578dc5c4fbfefb71c6b458c201571.tar.gz
opensim-SC-815278531ab578dc5c4fbfefb71c6b458c201571.tar.bz2
opensim-SC-815278531ab578dc5c4fbfefb71c6b458c201571.tar.xz
* Improve login failure handling.
* Now it should properly inform the user and stop a login if a region server could not be contacted in order to expect a user (the last commit didn't actually quite work correctly)
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 518ba09..7b93bfb 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Communications.Local
122 122
123 private Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$"); 123 private Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$");
124 124
125 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest) 125 public override bool CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest)
126 { 126 {
127 ulong currentRegion = 0; 127 ulong currentRegion = 0;
128 128
@@ -145,7 +145,6 @@ namespace OpenSim.Region.Communications.Local
145 { 145 {
146 currentRegion = theUser.HomeRegion; 146 currentRegion = theUser.HomeRegion;
147 response.StartLocation = "home"; 147 response.StartLocation = "home";
148
149 } 148 }
150 else 149 else
151 { 150 {
@@ -264,7 +263,10 @@ namespace OpenSim.Region.Communications.Local
264 else 263 else
265 { 264 {
266 m_log.Warn("[LOGIN]: Not found region " + currentRegion); 265 m_log.Warn("[LOGIN]: Not found region " + currentRegion);
266 return false;
267 } 267 }
268
269 return true;
268 } 270 }
269 271
270 private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL) 272 private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL)