From c299414d508d87259cc4bf17fd19a564ba99c6b5 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 25 Jun 2015 15:01:43 -0700 Subject: [PATCH] Fixed bad-ish code in login patch --- OpenSim/Services/LLLoginService/LLLoginService.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 143ee0ccc5..96f2621981 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs @@ -82,7 +82,6 @@ namespace OpenSim.Services.LLLoginService protected string m_ClassifiedFee; protected string m_DestinationGuide; protected string m_AvatarPicker; - protected string m_NewMessage; protected string m_AllowedClients; protected string m_DeniedClients; protected string m_MessageUrl; @@ -256,6 +255,7 @@ namespace OpenSim.Services.LLLoginService { bool success = false; UUID session = UUID.Random(); + string processedMessage; m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}", firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0); @@ -493,17 +493,18 @@ namespace OpenSim.Services.LLLoginService if (m_MessageUrl != String.Empty) { WebClient client = new WebClient(); - string WebMessage = client.DownloadString(m_MessageUrl); - m_NewMessage = WebMessage.Replace("\\n", "\n").Replace("", firstName + " " + lastName); + processedMessage = client.DownloadString(m_MessageUrl); } else { - m_NewMessage = m_WelcomeMessage.Replace("\\n", "\n").Replace("", firstName + " " + lastName); + processedMessage = m_WelcomeMessage; } + processedMessage = processedMessage.Replace("\\n", "\n").Replace("", firstName + " " + lastName); + LLLoginResponse response = new LLLoginResponse( account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, - where, startLocation, position, lookAt, gestures, m_NewMessage, home, clientIP, + where, startLocation, position, lookAt, gestures, processedMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone, m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee);