From 995242b351a5460bbb6358f490a6679f7e660b42 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 3 Jan 2017 18:31:17 +0000 Subject: Suppress misleading message when logging in locally The gatekeeper and travel info address will not actually be set there, stop OpenSim from showing a blank address. It's confusing. --- OpenSim/Services/HypergridService/UserAgentService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'OpenSim/Services') diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 317d006..e701ec6 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs @@ -301,8 +301,12 @@ namespace OpenSim.Services.HypergridService // Everything is ok - // Update the perceived IP Address of our grid - m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); + if (!fromLogin) + { + // Update the perceived IP Address of our grid + m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); + } + travel.MyIpAddress = myExternalIP; StoreTravelInfo(travel); -- cgit v1.1 From b0db5752202f8e8e56390ac0c062b9f500575290 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Wed, 4 Jan 2017 19:13:59 +0000 Subject: Set a sensible default for the MaxAgentGroups parameter MaxAgentGroups is in the [Groups] section, but is read by the login service. If the login service and the groups service don't share the same ini file, that will be sent to the viewer as zero and groups will not work. --- OpenSim/Services/LLLoginService/LLLoginService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Services') diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 5d69705..80fc56f 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs @@ -82,7 +82,7 @@ namespace OpenSim.Services.LLLoginService protected string m_SearchURL; protected string m_Currency; protected string m_ClassifiedFee; - protected int m_MaxAgentGroups; + protected int m_MaxAgentGroups = 42; protected string m_DestinationGuide; protected string m_AvatarPicker; protected string m_AllowedClients; -- cgit v1.1 From af1b00db419d21d629cd1d5cd0ec4e06060d310f Mon Sep 17 00:00:00 2001 From: Mandarinka Tasty Date: Sun, 1 Jan 2017 21:36:40 +0100 Subject: The robust command login reset should return config value: MinLoginLevel. Defaultly, it returns 0. Signed-off-by: Mandarinka Tasty Signed-off-by: Melanie Thielker --- OpenSim/Services/LLLoginService/LLLoginService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Services') diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 80fc56f..2941f51 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs @@ -1066,8 +1066,8 @@ namespace OpenSim.Services.LLLoginService } break; - case "reset": - m_MinLoginLevel = 0; + case "reset": + m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); MainConsole.Instance.OutputFormat("Reset min login level to {0}", m_MinLoginLevel); break; -- cgit v1.1