From fb258c5ed98a1b7b1046e7387d8f130f7a4587d3 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 12 Mar 2009 15:28:30 +0000 Subject: [PATCH] Update svn properties, formatting cleanup. --- OpenSim/Data/RegionProfileData.cs | 14 +++++++------- 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 7dd4a41b4a..8ff2184402 100644 --- a/OpenSim/Data/RegionProfileData.cs +++ b/OpenSim/Data/RegionProfileData.cs @@ -280,22 +280,22 @@ namespace OpenSim.Data set { originUUID = value; } } - public RegionInfo ToRegionInfo( ) + public RegionInfo ToRegionInfo() { - return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort, serverURI ); + return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort, serverURI); } - public static RegionProfileData FromRegionInfo( RegionInfo regionInfo ) + public static RegionProfileData FromRegionInfo(RegionInfo regionInfo) { - if( regionInfo == null ) + if (regionInfo == null) { return null; } return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX, - regionInfo.RegionLocY, regionInfo.ExternalHostName, - (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort, - regionInfo.ServerURI); + regionInfo.RegionLocY, regionInfo.ExternalHostName, + (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort, + regionInfo.ServerURI); } 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 278ea43c30..92bf83f71e 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs @@ -318,7 +318,7 @@ namespace OpenSim.Framework.Communications return GoodLogin; } - protected virtual bool TryAuthenticateLLSDLogin( string firstname, string lastname, string passwd, out UserProfileData userProfile) + protected virtual bool TryAuthenticateLLSDLogin(string firstname, string lastname, string passwd, out UserProfileData userProfile) { bool GoodLogin = false; userProfile = GetTheUser(firstname, lastname); @@ -369,7 +369,7 @@ namespace OpenSim.Framework.Communications } m_log.Info("[LOGIN]: LLSD Login Requested for: '" + firstname+"' '"+lastname+"' / "+passwd); - if (!TryAuthenticateLLSDLogin( firstname, lastname, passwd, out userProfile)) + if (!TryAuthenticateLLSDLogin(firstname, lastname, passwd, out userProfile)) { return logResponse.CreateLoginFailedResponseLLSD(); } @@ -985,7 +985,7 @@ namespace OpenSim.Framework.Communications m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead"); regionInfo = GetRegionInfo(defaultHandle); - if( regionInfo == null ) + if (regionInfo == null) { m_log.ErrorFormat("[LOGIN]: No default region available. Aborting."); return false;