Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor

1 files changed, 0 insertions, 31 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f3f715a..f265769 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -200,12 +200,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();
         }
 
@@ -276,31 +270,6 @@ namespace OpenSim
         }
 
         /// <summary>
-        /// 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.
-        /// </summary>
-        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;
-            }
-        }
-
-        /// <summary>
         /// Execute the region creation process.  This includes setting up scene infrastructure.
         /// </summary>
         /// <param name="regionInfo"></param>