From e0a06f641668cd5c25a7854af2faf8a61c4053ee Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Tue, 5 May 2009 16:17:52 +0000
Subject: - moving banned check and public/private check to  
 Scene.NewUserConnection() - adding reason reporting

this enforces estate bans very early on and prevents us from
circulating client objects that we'd then have to retract once we
realize that the client is not allowed into the region

---
 OpenSim/Framework/Communications/Services/LoginResponse.cs | 2 +-
 OpenSim/Framework/Communications/Services/LoginService.cs  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework/Communications/Services')

diff --git a/OpenSim/Framework/Communications/Services/LoginResponse.cs b/OpenSim/Framework/Communications/Services/LoginResponse.cs
index d91bf84..4b5c99d 100644
--- a/OpenSim/Framework/Communications/Services/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/Services/LoginResponse.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Framework.Communications.Services
         {
             return GenerateFailureResponseLLSD(
                 "key",
-                "Error connecting to grid. Could not percieve credentials from login XML.",
+                "Error connecting to grid. Could not perceive credentials from login XML.",
                 "false");
         }
 
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 168f7a6..f55c030 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -946,13 +946,15 @@ namespace OpenSim.Framework.Communications.Services
             {
                 regionInfo = homeInfo;
                 theUser.CurrentAgent.Position = theUser.HomeLocation;
-                response.LookAt = "[r" + theUser.HomeLookAt.X.ToString() + ",r" + theUser.HomeLookAt.Y.ToString() + ",r" + theUser.HomeLookAt.Z.ToString() + "]";
+                response.LookAt = String.Format("[r{0},r{1},r{2}]", theUser.HomeLookAt.X.ToString(), 
+                                                theUser.HomeLookAt.Y.ToString(), theUser.HomeLookAt.Z.ToString());
             }
             else if (startLocationRequest == "last")
             {
                 UUID lastRegion = theUser.CurrentAgent.Region;
                 regionInfo = GetRegionInfo(lastRegion);
-                response.LookAt = "[r" + theUser.CurrentAgent.LookAt.X.ToString() + ",r" + theUser.CurrentAgent.LookAt.Y.ToString() + ",r" + theUser.CurrentAgent.LookAt.Z.ToString() + "]";
+                response.LookAt = String.Format("[r{0},r{1},r{2}]", theUser.CurrentAgent.LookAt.X.ToString(),
+                                                theUser.CurrentAgent.LookAt.Y.ToString(), theUser.CurrentAgent.LookAt.Z.ToString());
             }
             else
             {
-- 
cgit v1.1