Formatting cleanup. Minor refactoring.

2 files changed, 12 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index a815662..4a31986 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -170,7 +170,6 @@ namespace OpenSim.Framework.UserManagement
             AddClassifiedCategory((Int32) 8, "Service");
             AddClassifiedCategory((Int32) 9, "Personal");
 
-
             SessionID = LLUUID.Random();
             SecureSessionID = LLUUID.Random();
             AgentID = LLUUID.Random();
@@ -244,7 +243,10 @@ namespace OpenSim.Framework.UserManagement
         {
             return
                 (GenerateFailureResponse("presence",
-                                         "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner. Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously.",
+                                         "You appear to be already logged in. " +
+                                         "If this is not the case please wait for your session to timeout. " +
+                                         "If this takes longer than a few minutes please contact the grid owner. " +
+                                         "Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously.",
                                          "false"));
         }
 
@@ -252,7 +254,9 @@ namespace OpenSim.Framework.UserManagement
         {
             return GenerateFailureResponseLLSD(
                 "presence",
-                "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner",
+                "You appear to be already logged in. " +
+                "If this is not the case please wait for your session to timeout. " +
+                "If this takes longer than a few minutes please contact the grid owner",
                 "false");
         }
 
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 72b408b..be47258 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -121,6 +121,7 @@ namespace OpenSim.Framework.UserManagement
 
                         return logResponse.CreateLoginFailedResponse();
                     }
+
                     if (requestData.Contains("passwd"))
                     {
                         string passwd = (string)requestData["passwd"];
@@ -494,8 +495,8 @@ namespace OpenSim.Framework.UserManagement
         }
 
         public string GetLoginForm(string firstname, string lastname, string location, string region, 
-                                    string grid, string channel, string version, string lang, 
-                                    string password, string errormessages)
+                                   string grid, string channel, string version, string lang, 
+                                   string password, string errormessages)
         {
             // inject our values in the form at the markers
 
@@ -522,6 +523,7 @@ namespace OpenSim.Framework.UserManagement
             loginform = loginform.Replace("[$lang]", lang);
             loginform = loginform.Replace("[$password]", password);
             loginform = loginform.Replace("[$errors]", errormessages);
+
             return loginform;
         }
 
@@ -588,6 +590,7 @@ namespace OpenSim.Framework.UserManagement
             responseString += "</div>";
             responseString += "</body>";
             responseString += "</html>";
+
             return responseString;
         }