From 0b8d22ab544910a2b9b89b4bee2926a90b0da63f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 5 Jan 2009 16:30:35 +0000
Subject: * Check in login service tests beachhead

---
 OpenSim/Region/Communications/Local/LocalLoginService.cs | 6 +++---
 OpenSim/Region/Environment/Scenes/Scene.cs               | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region')

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
 
             if ((regionInfo != null) && (PrepareLoginToRegion(regionInfo, theUser, response)))
             {
-                    return true;
+                return true;
             }
 
             // StartLocation not available, send him to a nearby region instead
@@ -303,11 +303,9 @@ namespace OpenSim.Region.Communications.Local
             
             string seedcap = "http://";
             
-
             if (serversInfo.HttpUsesSSL)
             {
                 seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + "/CAPS/" + capsPath + "0000/";
-
             }
             else
             {
@@ -320,9 +318,11 @@ namespace OpenSim.Region.Communications.Local
             m_log.InfoFormat(
                 "[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection",
                 regionInfo.RegionName, response.RegionX, response.RegionY, regionInfo.ServerURI);
+            
             // Update agent with target sim
             user.CurrentAgent.Region = regionInfo.RegionID;
             user.CurrentAgent.Handle = regionInfo.RegionHandle;
+            
             // Prepare notification
             Login loginParams = new Login();
             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
             if (RegionInfo.EstateSettings.IsBanned(agentId))
                 return;
 
-
             String capsObjectPath = GetCapsPath(agentId);
 
             m_log.DebugFormat(
-- 
cgit v1.1