OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bad-ish code in login patch

fsassets
Diva Canto 2015-06-25 15:01:43 -07:00
parent 4131fbea0c
commit c299414d50
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -82,7 +82,6 @@ namespace OpenSim.Services.LLLoginService
protected string m_ClassifiedFee; protected string m_ClassifiedFee;
protected string m_DestinationGuide; protected string m_DestinationGuide;
protected string m_AvatarPicker; protected string m_AvatarPicker;
protected string m_NewMessage;
protected string m_AllowedClients; protected string m_AllowedClients;
protected string m_DeniedClients; protected string m_DeniedClients;
protected string m_MessageUrl; protected string m_MessageUrl;
@ -256,6 +255,7 @@ namespace OpenSim.Services.LLLoginService
{ {
bool success = false; bool success = false;
UUID session = UUID.Random(); 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}", 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); firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0);
@ -493,17 +493,18 @@ namespace OpenSim.Services.LLLoginService
if (m_MessageUrl != String.Empty) if (m_MessageUrl != String.Empty)
{ {
WebClient client = new WebClient(); WebClient client = new WebClient();
string WebMessage = client.DownloadString(m_MessageUrl); processedMessage = client.DownloadString(m_MessageUrl);
m_NewMessage = WebMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName);
} }
else else
{ {
m_NewMessage = m_WelcomeMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName); processedMessage = m_WelcomeMessage;
} }
processedMessage = processedMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName);
LLLoginResponse response LLLoginResponse response
= new LLLoginResponse( = new LLLoginResponse(
account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 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_MapTileURL, m_SearchURL, m_Currency, m_DSTZone,
m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee); m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee);