diff options
author | Justin Clarke Casey | 2009-01-05 16:30:35 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-05 16:30:35 +0000 |
commit | 0b8d22ab544910a2b9b89b4bee2926a90b0da63f (patch) | |
tree | b409ffaa85bfc48a369669854a1ff4493cc8829f /OpenSim/Region | |
parent | change the drop order to see if this affects unit test fails (diff) | |
download | opensim-SC_OLD-0b8d22ab544910a2b9b89b4bee2926a90b0da63f.zip opensim-SC_OLD-0b8d22ab544910a2b9b89b4bee2926a90b0da63f.tar.gz opensim-SC_OLD-0b8d22ab544910a2b9b89b4bee2926a90b0da63f.tar.bz2 opensim-SC_OLD-0b8d22ab544910a2b9b89b4bee2926a90b0da63f.tar.xz |
* Check in login service tests beachhead
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalLoginService.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index e139501..8aa88f7 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -219,7 +219,7 @@ namespace OpenSim.Region.Communications.Local | |||
219 | 219 | ||
220 | if ((regionInfo != null) && (PrepareLoginToRegion(regionInfo, theUser, response))) | 220 | if ((regionInfo != null) && (PrepareLoginToRegion(regionInfo, theUser, response))) |
221 | { | 221 | { |
222 | return true; | 222 | return true; |
223 | } | 223 | } |
224 | 224 | ||
225 | // StartLocation not available, send him to a nearby region instead | 225 | // StartLocation not available, send him to a nearby region instead |
@@ -303,11 +303,9 @@ namespace OpenSim.Region.Communications.Local | |||
303 | 303 | ||
304 | string seedcap = "http://"; | 304 | string seedcap = "http://"; |
305 | 305 | ||
306 | |||
307 | if (serversInfo.HttpUsesSSL) | 306 | if (serversInfo.HttpUsesSSL) |
308 | { | 307 | { |
309 | seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + "/CAPS/" + capsPath + "0000/"; | 308 | seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + "/CAPS/" + capsPath + "0000/"; |
310 | |||
311 | } | 309 | } |
312 | else | 310 | else |
313 | { | 311 | { |
@@ -320,9 +318,11 @@ namespace OpenSim.Region.Communications.Local | |||
320 | m_log.InfoFormat( | 318 | m_log.InfoFormat( |
321 | "[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection", | 319 | "[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection", |
322 | regionInfo.RegionName, response.RegionX, response.RegionY, regionInfo.ServerURI); | 320 | regionInfo.RegionName, response.RegionX, response.RegionY, regionInfo.ServerURI); |
321 | |||
323 | // Update agent with target sim | 322 | // Update agent with target sim |
324 | user.CurrentAgent.Region = regionInfo.RegionID; | 323 | user.CurrentAgent.Region = regionInfo.RegionID; |
325 | user.CurrentAgent.Handle = regionInfo.RegionHandle; | 324 | user.CurrentAgent.Handle = regionInfo.RegionHandle; |
325 | |||
326 | // Prepare notification | 326 | // Prepare notification |
327 | Login loginParams = new Login(); | 327 | Login loginParams = new Login(); |
328 | loginParams.Session = user.CurrentAgent.SessionID; | 328 | loginParams.Session = user.CurrentAgent.SessionID; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index daeb186..d0013ba 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2860,7 +2860,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2860 | if (RegionInfo.EstateSettings.IsBanned(agentId)) | 2860 | if (RegionInfo.EstateSettings.IsBanned(agentId)) |
2861 | return; | 2861 | return; |
2862 | 2862 | ||
2863 | |||
2864 | String capsObjectPath = GetCapsPath(agentId); | 2863 | String capsObjectPath = GetCapsPath(agentId); |
2865 | 2864 | ||
2866 | m_log.DebugFormat( | 2865 | m_log.DebugFormat( |