From 81d5a4b6d8d8548dde98cbf827d171bb1ebf96ba Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 10 Jan 2010 03:03:18 +0000
Subject: Remove "login disable", "login enable" and "login status" commands.
---
OpenSim/Region/Application/OpenSim.cs | 48 ----------------------
OpenSim/Region/Application/OpenSimBase.cs | 31 --------------
.../Hypergrid/HGStandaloneLoginModule.cs | 15 -------
.../ServiceConnectorsOut/Grid/HGGridConnector.cs | 2 -
.../Framework/Scenes/SceneCommunicationService.cs | 7 ----
5 files changed, 103 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 82b2fd4..c9f2cfa 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -287,18 +287,6 @@ namespace OpenSim
"create region",
"Create a new region", HandleCreateRegion);
- m_console.Commands.AddCommand("region", false, "login enable",
- "login enable",
- "Enable logins to the simulator", HandleLoginEnable);
-
- m_console.Commands.AddCommand("region", false, "login disable",
- "login disable",
- "Disable logins to the simulator", HandleLoginDisable);
-
- m_console.Commands.AddCommand("region", false, "login status",
- "login status",
- "Display status of logins", HandleLoginStatus);
-
m_console.Commands.AddCommand("region", false, "restart",
"restart",
"Restart all sims in this instance", RunCommand);
@@ -559,42 +547,6 @@ namespace OpenSim
}
///
- /// Enable logins
- ///
- ///
- ///
- private void HandleLoginEnable(string module, string[] cmd)
- {
- ProcessLogin(true);
- }
-
-
- ///
- /// Disable logins
- ///
- ///
- ///
- private void HandleLoginDisable(string module, string[] cmd)
- {
- ProcessLogin(false);
- }
-
- ///
- /// Log login status to the console
- ///
- ///
- ///
- private void HandleLoginStatus(string module, string[] cmd)
- {
- if (m_sceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled == false)
-
- m_log.Info("[ Login ] Login are disabled ");
- else
- m_log.Info("[ Login ] Login are enabled");
- }
-
-
- ///
/// Change and load configuration file data.
///
///
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 391856b..cf2ab65 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -203,12 +203,6 @@ namespace OpenSim
plugin.PostInitialise();
}
- // Only enable logins to the regions once we have completely finished starting up (apart from scripts)
- if ((SceneManager.CurrentOrFirstScene != null) && (SceneManager.CurrentOrFirstScene.SceneGridService != null))
- {
- SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = true;
- }
-
AddPluginCommands();
}
@@ -279,31 +273,6 @@ namespace OpenSim
}
///
- /// Initialises the asset cache. This supports legacy configuration values
- /// to ensure consistent operation, but values outside of that namespace
- /// are handled by the more generic resolution mechanism provided by
- /// the ResolveAssetServer virtual method. If extended resolution fails,
- /// then the normal default action is taken.
- /// Creation of the AssetCache is handled by ResolveAssetCache. This
- /// function accepts a reference to the instantiated AssetServer and
- /// returns an IAssetCache implementation, if possible. This is a virtual
- /// method.
- ///
- public void ProcessLogin(bool LoginEnabled)
- {
- if (LoginEnabled)
- {
- m_log.Info("[LOGIN]: Login is now enabled.");
- SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = true;
- }
- else
- {
- m_log.Info("[LOGIN]: Login is now disabled.");
- SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = false;
- }
- }
-
- ///
/// Execute the region creation process. This includes setting up scene infrastructure.
///
///
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
index 46ee3c0..0b54746 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
@@ -55,21 +55,6 @@ namespace OpenSim.Region.CoreModules.Hypergrid
protected bool m_enabled = false; // Module is only enabled if running in standalone mode
- public bool RegionLoginsEnabled
- {
- get
- {
- if (m_firstScene != null)
- {
- return m_firstScene.SceneGridService.RegionLoginsEnabled;
- }
- else
- {
- return false;
- }
- }
- }
-
protected HGLoginAuthService m_loginService;
#region IRegionModule Members
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 93cb60c..f9cd90f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -696,8 +696,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
public bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome)
{
comingHome = false;
- if (!m_aScene.SceneGridService.RegionLoginsEnabled)
- return false;
CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
if (uinfo != null)
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index f49d072..6164368 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -65,13 +65,6 @@ namespace OpenSim.Region.Framework.Scenes
protected List m_agentsInTransit;
- public bool RegionLoginsEnabled
- {
- get { return m_regionLoginsEnabled; }
- set { m_regionLoginsEnabled = value; }
- }
- private bool m_regionLoginsEnabled = false;
-
///
/// An agent is crossing into this region
///
--
cgit v1.1