OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, formatting cleanup.

0.6.5-rc1
Jeff Ames 2009-03-12 15:28:30 +00:00
parent 3865f777bd
commit fb258c5ed9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Data/RegionProfileData.cs
View File

@ -280,14 +280,14 @@ namespace OpenSim.Data
set { originUUID = value; } 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 null;
} }

6
OpenSim/Framework/Communications/LoginService.cs
View File

@ -318,7 +318,7 @@ namespace OpenSim.Framework.Communications
return GoodLogin; 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; bool GoodLogin = false;
userProfile = GetTheUser(firstname, lastname); userProfile = GetTheUser(firstname, lastname);
@ -369,7 +369,7 @@ namespace OpenSim.Framework.Communications
} }
m_log.Info("[LOGIN]: LLSD Login Requested for: '" + firstname+"' '"+lastname+"' / "+passwd); 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(); return logResponse.CreateLoginFailedResponseLLSD();
} }
@ -985,7 +985,7 @@ namespace OpenSim.Framework.Communications
m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead"); m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead");
regionInfo = GetRegionInfo(defaultHandle); regionInfo = GetRegionInfo(defaultHandle);
if( regionInfo == null ) if (regionInfo == null)
{ {
m_log.ErrorFormat("[LOGIN]: No default region available. Aborting."); m_log.ErrorFormat("[LOGIN]: No default region available. Aborting.");
return false; return false;