diff options
-rw-r--r-- | OpenSim/Data/RegionProfileData.cs | 14 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs index 7dd4a41..8ff2184 100644 --- a/OpenSim/Data/RegionProfileData.cs +++ b/OpenSim/Data/RegionProfileData.cs | |||
@@ -280,22 +280,22 @@ namespace OpenSim.Data | |||
280 | set { originUUID = value; } | 280 | set { originUUID = value; } |
281 | } | 281 | } |
282 | 282 | ||
283 | public RegionInfo ToRegionInfo( ) | 283 | public RegionInfo ToRegionInfo() |
284 | { | 284 | { |
285 | return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort, serverURI ); | 285 | return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort, serverURI); |
286 | } | 286 | } |
287 | 287 | ||
288 | public static RegionProfileData FromRegionInfo( RegionInfo regionInfo ) | 288 | public static RegionProfileData FromRegionInfo(RegionInfo regionInfo) |
289 | { | 289 | { |
290 | if( regionInfo == null ) | 290 | if (regionInfo == null) |
291 | { | 291 | { |
292 | return null; | 292 | return null; |
293 | } | 293 | } |
294 | 294 | ||
295 | return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX, | 295 | return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX, |
296 | regionInfo.RegionLocY, regionInfo.ExternalHostName, | 296 | regionInfo.RegionLocY, regionInfo.ExternalHostName, |
297 | (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort, | 297 | (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort, |
298 | regionInfo.ServerURI); | 298 | regionInfo.ServerURI); |
299 | } | 299 | } |
300 | 300 | ||
301 | public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri) | 301 | public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri) |
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 278ea43..92bf83f 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -318,7 +318,7 @@ namespace OpenSim.Framework.Communications | |||
318 | return GoodLogin; | 318 | return GoodLogin; |
319 | } | 319 | } |
320 | 320 | ||
321 | protected virtual bool TryAuthenticateLLSDLogin( string firstname, string lastname, string passwd, out UserProfileData userProfile) | 321 | protected virtual bool TryAuthenticateLLSDLogin(string firstname, string lastname, string passwd, out UserProfileData userProfile) |
322 | { | 322 | { |
323 | bool GoodLogin = false; | 323 | bool GoodLogin = false; |
324 | userProfile = GetTheUser(firstname, lastname); | 324 | userProfile = GetTheUser(firstname, lastname); |
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Communications | |||
369 | } | 369 | } |
370 | m_log.Info("[LOGIN]: LLSD Login Requested for: '" + firstname+"' '"+lastname+"' / "+passwd); | 370 | m_log.Info("[LOGIN]: LLSD Login Requested for: '" + firstname+"' '"+lastname+"' / "+passwd); |
371 | 371 | ||
372 | if (!TryAuthenticateLLSDLogin( firstname, lastname, passwd, out userProfile)) | 372 | if (!TryAuthenticateLLSDLogin(firstname, lastname, passwd, out userProfile)) |
373 | { | 373 | { |
374 | return logResponse.CreateLoginFailedResponseLLSD(); | 374 | return logResponse.CreateLoginFailedResponseLLSD(); |
375 | } | 375 | } |
@@ -985,7 +985,7 @@ namespace OpenSim.Framework.Communications | |||
985 | m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead"); | 985 | m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead"); |
986 | regionInfo = GetRegionInfo(defaultHandle); | 986 | regionInfo = GetRegionInfo(defaultHandle); |
987 | 987 | ||
988 | if( regionInfo == null ) | 988 | if (regionInfo == null) |
989 | { | 989 | { |
990 | m_log.ErrorFormat("[LOGIN]: No default region available. Aborting."); | 990 | m_log.ErrorFormat("[LOGIN]: No default region available. Aborting."); |
991 | return false; | 991 | return false; |