From f2ec151328a34bf9c2e20e2e6ff2695e69e91f69 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Mon, 6 Oct 2008 14:02:42 +0000 Subject: [PATCH] Mantis#2340. Thank you kindly, Sacha Magne for a patch that: adding default_loginLevel in USerServer.xml to set a default login level to acces to the grid. Fixing one bug in login_reset --- OpenSim/Framework/UserConfig.cs | 13 +++++++++++-- OpenSim/Grid/UserServer/Main.cs | 9 +++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index 6cf526c0b4..87ba271465 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs @@ -46,6 +46,7 @@ namespace OpenSim.Framework public string GridSendKey = String.Empty; public uint HttpPort = DefaultHttpPort; public bool HttpSSL = DefaultHttpSSL; + public uint DefaultUserLevel = 0; private Uri m_inventoryUrl; @@ -122,7 +123,11 @@ namespace OpenSim.Framework configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Known good region Y", "1000", false); configMember.addConfigurationOption("enable_llsd_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, - "Enable LLSD login support [Currently used by libsl based clients/bots]? true/false", true.ToString(), false); + "Enable LLSD login support [Currently used by libsl based clients/bots]? true/false", true.ToString(), false); + + configMember.addConfigurationOption("default_loginLevel", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, + "Minimum Level a user should have to login [0 default]", "0", false); + } public bool handleIncomingConfiguration(string configuration_key, object configuration_result) @@ -165,9 +170,13 @@ namespace OpenSim.Framework case "enable_llsd_login": EnableLLSDLogin = (bool)configuration_result; break; + + case "default_loginLevel": + DefaultUserLevel = (uint)configuration_result; + break; } return true; } } -} \ No newline at end of file +} diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index e24b486a02..787679e391 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -124,6 +124,10 @@ namespace OpenSim.Grid.UserServer m_httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin); + // + // Get the minimum defaultLevel to access to the grid + // + m_loginService.setloginlevel((int)Cfg.DefaultUserLevel); if (Cfg.EnableLLSDLogin) { @@ -294,10 +298,7 @@ namespace OpenSim.Grid.UserServer } break; case "login-reset": - if (cmdparams.Length == 1) - { - m_loginService.setloginlevel(0); - } + m_loginService.setloginlevel(0); break; case "login-text": if (cmdparams.Length == 1)