ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

make fallback login to any region online optional. All but very simple standalones shoult set it to false and define default (and fallback) regions

Browse Source
This commit is contained in:
UbitUmarov
2021-12-07 01:35:21 +00:00
parent 2db2791771
commit b4241d79b6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,6 @@ namespace OpenSim.Services.LLLoginService
protected GatekeeperServiceConnector m_GatekeeperConnector; protected GatekeeperServiceConnector m_GatekeeperConnector;
protected string m_DefaultRegionName;
protected string m_WelcomeMessage; protected string m_WelcomeMessage;
protected bool m_RequireInventory; protected bool m_RequireInventory;
protected int m_MinLoginLevel; protected int m_MinLoginLevel;
@@ -92,6 +91,8 @@ namespace OpenSim.Services.LLLoginService
protected string m_DSTZone; protected string m_DSTZone;
protected bool m_allowDuplicatePresences = false; protected bool m_allowDuplicatePresences = false;
protected string m_messageKey; protected string m_messageKey;
protected bool m_allowLoginFallbackToAnyRegion = true; // if login requested region if not found and there are no Default or fallback regions,
// try any online. This is legacy behaviour
IConfig m_LoginServerConfig; IConfig m_LoginServerConfig;
// IConfig m_ClientsConfig; // IConfig m_ClientsConfig;
@@ -114,7 +115,6 @@ namespace OpenSim.Services.LLLoginService
string avatarService = m_LoginServerConfig.GetString("AvatarService", string.Empty); string avatarService = m_LoginServerConfig.GetString("AvatarService", string.Empty);
string simulationService = m_LoginServerConfig.GetString("SimulationService", string.Empty); string simulationService = m_LoginServerConfig.GetString("SimulationService", string.Empty);
m_DefaultRegionName = m_LoginServerConfig.GetString("DefaultRegion", string.Empty);
m_WelcomeMessage = m_LoginServerConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); m_WelcomeMessage = m_LoginServerConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true); m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true);
m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false); m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false);
@@ -128,7 +128,9 @@ namespace OpenSim.Services.LLLoginService
m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty); m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty); m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty);
m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty); m_AvatarPicker = m_LoginServerConfig.GetString("AvatarPicker", string.Empty);
m_allowLoginFallbackToAnyRegion = m_LoginServerConfig.GetBoolean("AllowLoginFallbackToAnyRegion", m_allowLoginFallbackToAnyRegion);
string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "LoginService" }; string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "LoginService" };
m_AllowedClients = Util.GetConfigVarFromSections<string>( m_AllowedClients = Util.GetConfigVarFromSections<string>(
@@ -801,12 +803,15 @@ namespace OpenSim.Services.LLLoginService
private GridRegion FindAlternativeRegion(UUID scopeID) private GridRegion FindAlternativeRegion(UUID scopeID)
{ {
List<GridRegion> regions = m_GridService.GetFallbackRegions(scopeID, (int)Util.RegionToWorldLoc(1000), (int)Util.RegionToWorldLoc(1000)); List<GridRegion> regions = m_GridService.GetFallbackRegions(scopeID, (int)Util.RegionToWorldLoc(1000), (int)Util.RegionToWorldLoc(1000));
if (regions != null && regions.Count > 0) if (regions != null && regions.Count > 0 )
return regions[0]; return regions[0];
regions = m_GridService.GetOnlineRegions(scopeID, (int)Util.RegionToWorldLoc(1000), (int)Util.RegionToWorldLoc(1000), 10); if(m_allowLoginFallbackToAnyRegion)
if (regions != null && regions.Count > 0) {
return regions[0]; regions = m_GridService.GetOnlineRegions(scopeID, (int)Util.RegionToWorldLoc(1000), (int)Util.RegionToWorldLoc(1000), 10);
if (regions != null && regions.Count > 0)
return regions[0];
}
return null; return null;
} }