diff options
author | Dahlia Trimble | 2008-11-24 09:53:49 +0000 |
---|---|---|
committer | Dahlia Trimble | 2008-11-24 09:53:49 +0000 |
commit | d8bb20fc1ca748bd44b87cc46422945d16098ec1 (patch) | |
tree | 433e1ccda44ea69c586c5b0de26029013df4c0be | |
parent | Remove code from an experimantal patch that wasn't supposed to be committed (diff) | |
download | opensim-SC_OLD-d8bb20fc1ca748bd44b87cc46422945d16098ec1.zip opensim-SC_OLD-d8bb20fc1ca748bd44b87cc46422945d16098ec1.tar.gz opensim-SC_OLD-d8bb20fc1ca748bd44b87cc46422945d16098ec1.tar.bz2 opensim-SC_OLD-d8bb20fc1ca748bd44b87cc46422945d16098ec1.tar.xz |
Thanks SachaMagne for a patch which adds the following console commands:
login-enable : Allow login at sim level (opensim.exe)
login-disable: Stop any login BUT keep the logged avt
login-status : Return the actual status
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 15 |
2 files changed, 32 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 765c471..d44eedf 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -310,6 +310,19 @@ namespace OpenSim | |||
310 | Create(cmdparams); | 310 | Create(cmdparams); |
311 | break; | 311 | break; |
312 | 312 | ||
313 | case "login-enable": | ||
314 | ProcessLogin(true); | ||
315 | break; | ||
316 | case "login-disable": | ||
317 | ProcessLogin(false); | ||
318 | break; | ||
319 | case "login-status": | ||
320 | if (m_commsManager.GridService.RegionLoginsEnabled == false) | ||
321 | |||
322 | m_log.Info("[ Login ] Login are disabled "); | ||
323 | else | ||
324 | m_log.Info("[ Login ] Login are enabled"); | ||
325 | break; | ||
313 | case "create-region": | 326 | case "create-region": |
314 | string regionsDir = ConfigSource.Source.Configs["Startup"].GetString("regionload_regionsdir", "Regions").Trim(); | 327 | string regionsDir = ConfigSource.Source.Configs["Startup"].GetString("regionload_regionsdir", "Regions").Trim(); |
315 | string regionFile = String.Format("{0}/{1}", regionsDir, cmdparams[1]); | 328 | string regionFile = String.Format("{0}/{1}", regionsDir, cmdparams[1]); |
@@ -659,6 +672,9 @@ namespace OpenSim | |||
659 | m_console.Notice("config get section field - get a config value"); | 672 | m_console.Notice("config get section field - get a config value"); |
660 | m_console.Notice("config save - save OpenSim.ini"); | 673 | m_console.Notice("config save - save OpenSim.ini"); |
661 | m_console.Notice("terrain help - show help for terrain commands."); | 674 | m_console.Notice("terrain help - show help for terrain commands."); |
675 | m_console.Notice("login-enable - Allows login at sim level"); | ||
676 | m_console.Notice("login-disable - Disable login at sim level"); | ||
677 | m_console.Notice("login-status - Show the actual login status"); | ||
662 | 678 | ||
663 | ShowPluginCommandsHelp(CombineParams(helpArgs, 0), m_console); | 679 | ShowPluginCommandsHelp(CombineParams(helpArgs, 0), m_console); |
664 | 680 | ||
@@ -680,7 +696,7 @@ namespace OpenSim | |||
680 | case "assets": | 696 | case "assets": |
681 | m_assetCache.ShowState(); | 697 | m_assetCache.ShowState(); |
682 | break; | 698 | break; |
683 | 699 | ||
684 | case "users": | 700 | case "users": |
685 | IList agents; | 701 | IList agents; |
686 | if (showParams.Length > 1 && showParams[1] == "full") | 702 | if (showParams.Length > 1 && showParams[1] == "full") |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 608de06..fb620c3 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -303,6 +303,21 @@ namespace OpenSim | |||
303 | return m_commsManager.AddUser(tempfirstname, templastname, tempPasswd, email, regX, regY); | 303 | return m_commsManager.AddUser(tempfirstname, templastname, tempPasswd, email, regX, regY); |
304 | } | 304 | } |
305 | 305 | ||
306 | public void ProcessLogin(bool LoginEnabled) | ||
307 | { | ||
308 | if (LoginEnabled) | ||
309 | { | ||
310 | m_log.Info("[Login] Login are now enabled "); | ||
311 | m_commsManager.GridService.RegionLoginsEnabled = true; | ||
312 | } | ||
313 | else | ||
314 | { | ||
315 | m_log.Info("[Login] Login are now disabled "); | ||
316 | m_commsManager.GridService.RegionLoginsEnabled = false; | ||
317 | } | ||
318 | |||
319 | } | ||
320 | |||
306 | /// <summary> | 321 | /// <summary> |
307 | /// Execute the region creation process. This includes setting up scene infrastructure. | 322 | /// Execute the region creation process. This includes setting up scene infrastructure. |
308 | /// </summary> | 323 | /// </summary> |