diff options
author | Melanie | 2010-01-10 03:03:18 +0000 |
---|---|---|
committer | Melanie | 2010-01-10 03:03:18 +0000 |
commit | 81d5a4b6d8d8548dde98cbf827d171bb1ebf96ba (patch) | |
tree | f8f820a1f62add2d945d768e1f306592027b2d0f /OpenSim/Region | |
parent | Fixes prim to prim collision. (diff) | |
download | opensim-SC_OLD-81d5a4b6d8d8548dde98cbf827d171bb1ebf96ba.zip opensim-SC_OLD-81d5a4b6d8d8548dde98cbf827d171bb1ebf96ba.tar.gz opensim-SC_OLD-81d5a4b6d8d8548dde98cbf827d171bb1ebf96ba.tar.bz2 opensim-SC_OLD-81d5a4b6d8d8548dde98cbf827d171bb1ebf96ba.tar.xz |
Remove "login disable", "login enable" and "login status" commands.
Diffstat (limited to 'OpenSim/Region')
5 files changed, 0 insertions, 103 deletions
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 | |||
287 | "create region", | 287 | "create region", |
288 | "Create a new region", HandleCreateRegion); | 288 | "Create a new region", HandleCreateRegion); |
289 | 289 | ||
290 | m_console.Commands.AddCommand("region", false, "login enable", | ||
291 | "login enable", | ||
292 | "Enable logins to the simulator", HandleLoginEnable); | ||
293 | |||
294 | m_console.Commands.AddCommand("region", false, "login disable", | ||
295 | "login disable", | ||
296 | "Disable logins to the simulator", HandleLoginDisable); | ||
297 | |||
298 | m_console.Commands.AddCommand("region", false, "login status", | ||
299 | "login status", | ||
300 | "Display status of logins", HandleLoginStatus); | ||
301 | |||
302 | m_console.Commands.AddCommand("region", false, "restart", | 290 | m_console.Commands.AddCommand("region", false, "restart", |
303 | "restart", | 291 | "restart", |
304 | "Restart all sims in this instance", RunCommand); | 292 | "Restart all sims in this instance", RunCommand); |
@@ -559,42 +547,6 @@ namespace OpenSim | |||
559 | } | 547 | } |
560 | 548 | ||
561 | /// <summary> | 549 | /// <summary> |
562 | /// Enable logins | ||
563 | /// </summary> | ||
564 | /// <param name="module"></param> | ||
565 | /// <param name="cmd"></param> | ||
566 | private void HandleLoginEnable(string module, string[] cmd) | ||
567 | { | ||
568 | ProcessLogin(true); | ||
569 | } | ||
570 | |||
571 | |||
572 | /// <summary> | ||
573 | /// Disable logins | ||
574 | /// </summary> | ||
575 | /// <param name="module"></param> | ||
576 | /// <param name="cmd"></param> | ||
577 | private void HandleLoginDisable(string module, string[] cmd) | ||
578 | { | ||
579 | ProcessLogin(false); | ||
580 | } | ||
581 | |||
582 | /// <summary> | ||
583 | /// Log login status to the console | ||
584 | /// </summary> | ||
585 | /// <param name="module"></param> | ||
586 | /// <param name="cmd"></param> | ||
587 | private void HandleLoginStatus(string module, string[] cmd) | ||
588 | { | ||
589 | if (m_sceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled == false) | ||
590 | |||
591 | m_log.Info("[ Login ] Login are disabled "); | ||
592 | else | ||
593 | m_log.Info("[ Login ] Login are enabled"); | ||
594 | } | ||
595 | |||
596 | |||
597 | /// <summary> | ||
598 | /// Change and load configuration file data. | 550 | /// Change and load configuration file data. |
599 | /// </summary> | 551 | /// </summary> |
600 | /// <param name="module"></param> | 552 | /// <param name="module"></param> |
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 | |||
203 | plugin.PostInitialise(); | 203 | plugin.PostInitialise(); |
204 | } | 204 | } |
205 | 205 | ||
206 | // Only enable logins to the regions once we have completely finished starting up (apart from scripts) | ||
207 | if ((SceneManager.CurrentOrFirstScene != null) && (SceneManager.CurrentOrFirstScene.SceneGridService != null)) | ||
208 | { | ||
209 | SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = true; | ||
210 | } | ||
211 | |||
212 | AddPluginCommands(); | 206 | AddPluginCommands(); |
213 | } | 207 | } |
214 | 208 | ||
@@ -279,31 +273,6 @@ namespace OpenSim | |||
279 | } | 273 | } |
280 | 274 | ||
281 | /// <summary> | 275 | /// <summary> |
282 | /// Initialises the asset cache. This supports legacy configuration values | ||
283 | /// to ensure consistent operation, but values outside of that namespace | ||
284 | /// are handled by the more generic resolution mechanism provided by | ||
285 | /// the ResolveAssetServer virtual method. If extended resolution fails, | ||
286 | /// then the normal default action is taken. | ||
287 | /// Creation of the AssetCache is handled by ResolveAssetCache. This | ||
288 | /// function accepts a reference to the instantiated AssetServer and | ||
289 | /// returns an IAssetCache implementation, if possible. This is a virtual | ||
290 | /// method. | ||
291 | /// </summary> | ||
292 | public void ProcessLogin(bool LoginEnabled) | ||
293 | { | ||
294 | if (LoginEnabled) | ||
295 | { | ||
296 | m_log.Info("[LOGIN]: Login is now enabled."); | ||
297 | SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = true; | ||
298 | } | ||
299 | else | ||
300 | { | ||
301 | m_log.Info("[LOGIN]: Login is now disabled."); | ||
302 | SceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled = false; | ||
303 | } | ||
304 | } | ||
305 | |||
306 | /// <summary> | ||
307 | /// Execute the region creation process. This includes setting up scene infrastructure. | 276 | /// Execute the region creation process. This includes setting up scene infrastructure. |
308 | /// </summary> | 277 | /// </summary> |
309 | /// <param name="regionInfo"></param> | 278 | /// <param name="regionInfo"></param> |
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 | |||
55 | 55 | ||
56 | protected bool m_enabled = false; // Module is only enabled if running in standalone mode | 56 | protected bool m_enabled = false; // Module is only enabled if running in standalone mode |
57 | 57 | ||
58 | public bool RegionLoginsEnabled | ||
59 | { | ||
60 | get | ||
61 | { | ||
62 | if (m_firstScene != null) | ||
63 | { | ||
64 | return m_firstScene.SceneGridService.RegionLoginsEnabled; | ||
65 | } | ||
66 | else | ||
67 | { | ||
68 | return false; | ||
69 | } | ||
70 | } | ||
71 | } | ||
72 | |||
73 | protected HGLoginAuthService m_loginService; | 58 | protected HGLoginAuthService m_loginService; |
74 | 59 | ||
75 | #region IRegionModule Members | 60 | #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 | |||
696 | public bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome) | 696 | public bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome) |
697 | { | 697 | { |
698 | comingHome = false; | 698 | comingHome = false; |
699 | if (!m_aScene.SceneGridService.RegionLoginsEnabled) | ||
700 | return false; | ||
701 | 699 | ||
702 | CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID); | 700 | CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID); |
703 | if (uinfo != null) | 701 | 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 | |||
65 | 65 | ||
66 | protected List<UUID> m_agentsInTransit; | 66 | protected List<UUID> m_agentsInTransit; |
67 | 67 | ||
68 | public bool RegionLoginsEnabled | ||
69 | { | ||
70 | get { return m_regionLoginsEnabled; } | ||
71 | set { m_regionLoginsEnabled = value; } | ||
72 | } | ||
73 | private bool m_regionLoginsEnabled = false; | ||
74 | |||
75 | /// <summary> | 68 | /// <summary> |
76 | /// An agent is crossing into this region | 69 | /// An agent is crossing into this region |
77 | /// </summary> | 70 | /// </summary> |