aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorQuill Littlefeather2015-06-23 17:15:22 +0000
committerDiva Canto2015-06-25 14:53:51 -0700
commit4131fbea0c190fb5257803fd22758e8b06296df6 (patch)
treed8d06db9bd4f84b11fcd1a984325edb75034e114 /OpenSim/Services
parentFetchInventoryDescendents2: Signal to the viewer that folder with UUID.Zero i... (diff)
downloadopensim-SC_OLD-4131fbea0c190fb5257803fd22758e8b06296df6.zip
opensim-SC_OLD-4131fbea0c190fb5257803fd22758e8b06296df6.tar.gz
opensim-SC_OLD-4131fbea0c190fb5257803fd22758e8b06296df6.tar.bz2
opensim-SC_OLD-4131fbea0c190fb5257803fd22758e8b06296df6.tar.xz
Changes to Welcome Message sent to clients.
.gitignore | 1 + OpenSim/Services/LLLoginService/LLLoginService.cs | 32 +++++++++++++++-------- 1 files changed, 22 insertions(+), 11 deletions(-) Signed-off-by: Diva Canto <diva@metaverseink.com>
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs32
1 files changed, 21 insertions, 11 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index d2ff292..143ee0c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -82,10 +82,10 @@ namespace OpenSim.Services.LLLoginService
82 protected string m_ClassifiedFee; 82 protected string m_ClassifiedFee;
83 protected string m_DestinationGuide; 83 protected string m_DestinationGuide;
84 protected string m_AvatarPicker; 84 protected string m_AvatarPicker;
85 85 protected string m_NewMessage;
86 protected string m_AllowedClients; 86 protected string m_AllowedClients;
87 protected string m_DeniedClients; 87 protected string m_DeniedClients;
88 88 protected string m_MessageUrl;
89 protected string m_DSTZone; 89 protected string m_DSTZone;
90 90
91 IConfig m_LoginServerConfig; 91 IConfig m_LoginServerConfig;
@@ -125,7 +125,7 @@ namespace OpenSim.Services.LLLoginService
125 125
126 m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); 126 m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty);
127 m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); 127 m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty);
128 128 m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty);
129 m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time"); 129 m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time");
130 130
131 // Clean up some of these vars 131 // Clean up some of these vars
@@ -490,17 +490,27 @@ namespace OpenSim.Services.LLLoginService
490 // 490 //
491 // Finally, fill out the response and return it 491 // Finally, fill out the response and return it
492 // 492 //
493 if (m_MessageUrl != String.Empty)
494 {
495 WebClient client = new WebClient();
496 string WebMessage = client.DownloadString(m_MessageUrl);
497 m_NewMessage = WebMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName);
498 }
499 else
500 {
501 m_NewMessage = m_WelcomeMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName);
502 }
493 LLLoginResponse response 503 LLLoginResponse response
494 = new LLLoginResponse( 504 = new LLLoginResponse(
495 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 505 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
496 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, 506 where, startLocation, position, lookAt, gestures, m_NewMessage, home, clientIP,
497 m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone, 507 m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone,
498 m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee); 508 m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee);
499 509
500 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); 510 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
501 511
502 return response; 512 return response;
503 } 513 }
504 catch (Exception e) 514 catch (Exception e)
505 { 515 {
506 m_log.WarnFormat("[LLOGIN SERVICE]: Exception processing login for {0} {1}: {2} {3}", firstName, lastName, e.ToString(), e.StackTrace); 516 m_log.WarnFormat("[LLOGIN SERVICE]: Exception processing login for {0} {1}: {2} {3}", firstName, lastName, e.ToString(), e.StackTrace);