From 96ecdcf9c5ba35e589a599ad37cc6ce1a83f46f1 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 9 Jan 2010 18:04:50 -0800 Subject: * Added SetPassword to IAuthenticationService. * Added create user command to UserAccountService. Works. * Deleted create user command from OpenSim. --- OpenSim/Region/Application/OpenSim.cs | 74 ----------------------------------- 1 file changed, 74 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 82b2fd4..787d025 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -349,9 +349,6 @@ namespace OpenSim if (ConfigurationSettings.Standalone) { - m_console.Commands.AddCommand("region", false, "create user", - "create user [ [ [ [ []]]]]", - "Create a new user", HandleCreateUser); m_console.Commands.AddCommand("region", false, "reset user password", "reset user password [ [ []]]", @@ -813,22 +810,6 @@ namespace OpenSim } /// - /// Execute switch for some of the create commands - /// - /// - private void HandleCreateUser(string module, string[] cmd) - { - if (ConfigurationSettings.Standalone) - { - CreateUser(cmd); - } - else - { - m_log.Info("Create user is not available in grid mode, use the user server."); - } - } - - /// /// Execute switch for some of the reset commands /// /// @@ -1076,61 +1057,6 @@ namespace OpenSim } /// - /// Create a new user - /// - /// string array with parameters: firstname, lastname, password, locationX, locationY, email - protected void CreateUser(string[] cmdparams) - { - string firstName; - string lastName; - string password; - string email; - uint regX = 1000; - uint regY = 1000; - - IConfig standalone; - if ((standalone = m_config.Source.Configs["StandAlone"]) != null) - { - regX = (uint)standalone.GetInt("default_location_x", (int)regX); - regY = (uint)standalone.GetInt("default_location_y", (int)regY); - } - - - if (cmdparams.Length < 3) - firstName = MainConsole.Instance.CmdPrompt("First name", "Default"); - else firstName = cmdparams[2]; - - if (cmdparams.Length < 4) - lastName = MainConsole.Instance.CmdPrompt("Last name", "User"); - else lastName = cmdparams[3]; - - if (cmdparams.Length < 5) - password = MainConsole.Instance.PasswdPrompt("Password"); - else password = cmdparams[4]; - - if (cmdparams.Length < 6) - regX = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region X", regX.ToString())); - else regX = Convert.ToUInt32(cmdparams[5]); - - if (cmdparams.Length < 7) - regY = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region Y", regY.ToString())); - else regY = Convert.ToUInt32(cmdparams[6]); - - if (cmdparams.Length < 8) - email = MainConsole.Instance.CmdPrompt("Email", ""); - else email = cmdparams[7]; - - if (null == m_commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName)) - { - m_commsManager.UserAdminService.AddUser(firstName, lastName, password, email, regX, regY); - } - else - { - m_log.ErrorFormat("[CONSOLE]: A user with the name {0} {1} already exists!", firstName, lastName); - } - } - - /// /// Reset a user password. /// /// -- cgit v1.1 From 7cb66de2e022d1013eacb43dc0186a575a19a5c6 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 9 Jan 2010 18:16:14 -0800 Subject: * Moved command reset password from OpenSim to UserAccountService. --- OpenSim/Region/Application/OpenSim.cs | 47 ----------------------------------- 1 file changed, 47 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 787d025..31cc610 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -347,13 +347,6 @@ namespace OpenSim "kill uuid ", "Kill an object by UUID", KillUUID); - if (ConfigurationSettings.Standalone) - { - - m_console.Commands.AddCommand("region", false, "reset user password", - "reset user password [ [ []]]", - "Reset a user password", HandleResetUserPassword); - } m_console.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [ ] ", "Set local coordinate to map HG regions to", RunCommand); @@ -809,21 +802,6 @@ namespace OpenSim m_console.ConsoleScene = m_sceneManager.CurrentScene; } - /// - /// Execute switch for some of the reset commands - /// - /// - protected void HandleResetUserPassword(string module, string[] cmd) - { - if (ConfigurationSettings.Standalone) - { - ResetUserPassword(cmd); - } - else - { - m_log.Info("Reset user password is not available in grid mode, use the user-server."); - } - } /// /// Turn on some debugging values for OpenSim. @@ -1057,31 +1035,6 @@ namespace OpenSim } /// - /// Reset a user password. - /// - /// - private void ResetUserPassword(string[] cmdparams) - { - string firstName; - string lastName; - string newPassword; - - if (cmdparams.Length < 4) - firstName = MainConsole.Instance.CmdPrompt("First name"); - else firstName = cmdparams[3]; - - if (cmdparams.Length < 5) - lastName = MainConsole.Instance.CmdPrompt("Last name"); - else lastName = cmdparams[4]; - - if (cmdparams.Length < 6) - newPassword = MainConsole.Instance.PasswdPrompt("New password"); - else newPassword = cmdparams[5]; - - m_commsManager.UserAdminService.ResetUserPassword(firstName, lastName, newPassword); - } - - /// /// Use XML2 format to serialize data to a file /// /// -- cgit v1.1 From 3c90d834eac382af5edf091e83aea1ffcce91792 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 10 Jan 2010 22:41:42 +0000 Subject: Remove all references to master avatar, replacing with estate owner where appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. --- OpenSim/Region/Application/OpenSimBase.cs | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 391856b..2db17b1 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -586,35 +586,6 @@ namespace OpenSim scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); - // TODO: Remove this cruft once MasterAvatar is fully deprecated - //Master Avatar Setup - UserProfileData masterAvatar; - if (scene.RegionInfo.MasterAvatarAssignedUUID == UUID.Zero) - { - masterAvatar = - m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, - scene.RegionInfo.MasterAvatarLastName, - scene.RegionInfo.MasterAvatarSandboxPassword); - } - else - { - masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID); - scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName; - scene.RegionInfo.MasterAvatarLastName = masterAvatar.SurName; - } - - if (masterAvatar == null) - { - m_log.Info("[PARCEL]: No master avatar found, using null."); - scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero; - } - else - { - m_log.InfoFormat("[PARCEL]: Found master avatar {0} {1} [" + masterAvatar.ID.ToString() + "]", - scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName); - scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; - } - return scene; } -- cgit v1.1 From 49618dc102c42b7125303511d826f76f0ebaab4c Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 19:19:34 -0800 Subject: Moved GridInfo service from where it was to Handlers/Grid --- OpenSim/Region/Application/OpenSimBase.cs | 2 -- 1 file changed, 2 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 2db17b1..a834786 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -85,8 +85,6 @@ namespace OpenSim protected ConfigurationLoader m_configLoader; - protected GridInfoService m_gridInfoService; - public ConsoleCommand CreateAccount = null; protected List m_plugins = new List(); -- cgit v1.1 From dc4bbf6065ad4cb914c9d44f2e6496a2e3d99814 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 20:29:09 -0800 Subject: All Framework.Communications.Clients and Framework.Communications.Services deleted, including old LoginService. --- OpenSim/Region/Application/OpenSimBase.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index a834786..d745fdc 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -36,7 +36,6 @@ using Nini.Config; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; -- cgit v1.1 From bfddd75ca8946360728787e56a81b2d0f4a880f6 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 11 Jan 2010 05:12:01 +0000 Subject: Refactor. Instantiate sim status handlers in opensim base, not in a plugin --- OpenSim/Region/Application/OpenSim.cs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 31cc610..aedf21e 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -148,6 +148,11 @@ namespace OpenSim RegisterConsoleCommands(); + MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); + MainServer.Instance.AddStreamHandler(new OpenSim.XSimStatusHandler(this)); + if (userStatsURI != String.Empty) + MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this)); + base.StartupSpecific(); if (m_console is RemoteConsole) -- cgit v1.1 From 001d3695683d9511446d194feeb763c437170028 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 11 Jan 2010 07:45:47 -0800 Subject: CommunicationsManager deleted. --- OpenSim/Region/Application/HGCommands.cs | 6 +++--- OpenSim/Region/Application/OpenSimBase.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/HGCommands.cs b/OpenSim/Region/Application/HGCommands.cs index 7ae161d..a863697 100644 --- a/OpenSim/Region/Application/HGCommands.cs +++ b/OpenSim/Region/Application/HGCommands.cs @@ -44,14 +44,14 @@ namespace OpenSim { // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, CommunicationsManager m_commsManager, + public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version) { - HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(m_commsManager); + HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(); return new HGScene( - regionInfo, circuitManager, m_commsManager, sceneGridService, storageManager, + regionInfo, circuitManager, sceneGridService, storageManager, m_moduleLoader, false, m_configSettings.PhysicalPrim, m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); } diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index d745fdc..7963785 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -607,13 +607,13 @@ namespace OpenSim { bool hgrid = ConfigSource.Source.Configs["Startup"].GetBoolean("hypergrid", false); if (hgrid) - return HGCommands.CreateScene(regionInfo, circuitManager, m_commsManager, + return HGCommands.CreateScene(regionInfo, circuitManager, storageManager, m_moduleLoader, m_configSettings, m_config, m_version); - SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); + SceneCommunicationService sceneGridService = new SceneCommunicationService(); return new Scene( - regionInfo, circuitManager, m_commsManager, sceneGridService, + regionInfo, circuitManager, sceneGridService, storageManager, m_moduleLoader, false, m_configSettings.PhysicalPrim, m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); } -- cgit v1.1 From c5ea783526611a968400a1936e4c6764ee1c7013 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 11 Jan 2010 07:51:33 -0800 Subject: OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. --- OpenSim/Region/Application/OpenSimBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 7963785..f3f715a 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -36,7 +36,7 @@ using Nini.Config; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Cache; + using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; -- cgit v1.1 From 19ad68e5e4ef4ce8e5cb41f3ddec0dc6e839a53c Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 11 Jan 2010 08:11:04 -0800 Subject: Moved MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); around, because it was crashing. Now it crashes elsewhere. --- OpenSim/Region/Application/OpenSim.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index aedf21e..9f5e173 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -148,13 +148,13 @@ namespace OpenSim RegisterConsoleCommands(); + base.StartupSpecific(); + MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); MainServer.Instance.AddStreamHandler(new OpenSim.XSimStatusHandler(this)); if (userStatsURI != String.Empty) MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this)); - base.StartupSpecific(); - if (m_console is RemoteConsole) ((RemoteConsole)m_console).SetServer(m_httpServer); -- cgit v1.1 From 4e7c449c5a2ac8479ee302513a549ee56132140e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 11 Jan 2010 14:39:15 -0800 Subject: This fixes the problem that region modules (new style) weren't being recognized. --- OpenSim/Region/Application/OpenSimBase.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f3f715a..c6932cf 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -197,6 +197,7 @@ namespace OpenSim LoadPlugins(); foreach (IApplicationPlugin plugin in m_plugins) { + m_log.Debug("XXX PostInitialise " + plugin.Name); plugin.PostInitialise(); } -- cgit v1.1 From 77e43f480154b0a950d9d5f54df5c225fc64e77a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 11 Jan 2010 17:30:05 -0800 Subject: Fixed a couple of bugs with Appearance. Appearance is all good now. --- OpenSim/Region/Application/OpenSimBase.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index c6932cf..f3f715a 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -197,7 +197,6 @@ namespace OpenSim LoadPlugins(); foreach (IApplicationPlugin plugin in m_plugins) { - m_log.Debug("XXX PostInitialise " + plugin.Name); plugin.PostInitialise(); } -- cgit v1.1 From f1c30784ac767bf5f62e81748984b76d85d71f6a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 15 Jan 2010 15:11:58 -0800 Subject: * General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic. * HGSceneCommunicationService has been deleted * SceneCommunicationService will likely be deleted soon too --- OpenSim/Region/Application/HGCommands.cs | 2 +- OpenSim/Region/Application/OpenSim.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/HGCommands.cs b/OpenSim/Region/Application/HGCommands.cs index a863697..5b99d7d 100644 --- a/OpenSim/Region/Application/HGCommands.cs +++ b/OpenSim/Region/Application/HGCommands.cs @@ -47,7 +47,7 @@ namespace OpenSim public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version) { - HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(); + SceneCommunicationService sceneGridService = new SceneCommunicationService(); return new HGScene( diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 9f5e173..546a1d1 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -414,7 +414,7 @@ namespace OpenSim foreach (ScenePresence presence in agents) { - RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); + RegionInfo regionInfo = presence.Scene.RegionInfo; if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) && presence.Lastname.ToLower().Contains(cmdparams[3].ToLower())) @@ -908,7 +908,7 @@ namespace OpenSim foreach (ScenePresence presence in agents) { - RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); + RegionInfo regionInfo = presence.Scene.RegionInfo; string regionName; if (regionInfo == null) -- cgit v1.1 From 42f978a478093da579907e15dc29680a3711b27e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 30 Jan 2010 09:23:07 -0800 Subject: * HGScene is no more. * Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module --- OpenSim/Region/Application/HGCommands.cs | 60 ------------------------------- OpenSim/Region/Application/OpenSimBase.cs | 5 --- 2 files changed, 65 deletions(-) delete mode 100644 OpenSim/Region/Application/HGCommands.cs (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/HGCommands.cs b/OpenSim/Region/Application/HGCommands.cs deleted file mode 100644 index 5b99d7d..0000000 --- a/OpenSim/Region/Application/HGCommands.cs +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Xml; -using log4net; -using Nini.Config; -using OpenSim.Framework; -using OpenSim.Framework.Communications; -using OpenSim.Framework.Console; -using OpenSim.Region.Framework; -using OpenSim.Region.Framework.Scenes; -using OpenSim.Region.Framework.Scenes.Hypergrid; - -namespace OpenSim -{ - public class HGCommands - { -// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, - StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version) - { - SceneCommunicationService sceneGridService = new SceneCommunicationService(); - - return - new HGScene( - regionInfo, circuitManager, sceneGridService, storageManager, - m_moduleLoader, false, m_configSettings.PhysicalPrim, - m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); - } - - } -} diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f265769..06ffa91 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -574,11 +574,6 @@ namespace OpenSim protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager) { - bool hgrid = ConfigSource.Source.Configs["Startup"].GetBoolean("hypergrid", false); - if (hgrid) - return HGCommands.CreateScene(regionInfo, circuitManager, - storageManager, m_moduleLoader, m_configSettings, m_config, m_version); - SceneCommunicationService sceneGridService = new SceneCommunicationService(); return new Scene( -- cgit v1.1 From 041594ed075049f804fc157700a6d78e54194c0b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 13:01:23 -0800 Subject: Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs. --- OpenSim/Region/Application/Application.cs | 1 - OpenSim/Region/Application/ConfigurationLoader.cs | 14 -------------- OpenSim/Region/Application/OpenSim.cs | 13 +------------ 3 files changed, 1 insertion(+), 27 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 555baa4..7721cdf 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -129,7 +129,6 @@ namespace OpenSim configSource.AddSwitch("Startup", "inifile"); configSource.AddSwitch("Startup", "inimaster"); configSource.AddSwitch("Startup", "inidirectory"); - configSource.AddSwitch("Startup", "gridmode"); configSource.AddSwitch("Startup", "physics"); configSource.AddSwitch("Startup", "gui"); configSource.AddSwitch("Startup", "console"); diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 21edcc5..655c5ca 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -304,7 +304,6 @@ namespace OpenSim config.Set("region_info_source", "filesystem"); - config.Set("gridmode", false); config.Set("physics", "OpenDynamicsEngine"); config.Set("meshing", "Meshmerizer"); config.Set("physical_prim", true); @@ -342,19 +341,7 @@ namespace OpenSim if (null == config) config = defaultConfig.AddConfig("Network"); - config.Set("default_location_x", 1000); - config.Set("default_location_y", 1000); config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort); - config.Set("remoting_listener_port", ConfigSettings.DefaultRegionRemotingPort); - config.Set("grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); - config.Set("grid_send_key", "null"); - config.Set("grid_recv_key", "null"); - config.Set("user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); - config.Set("user_send_key", "null"); - config.Set("user_recv_key", "null"); - config.Set("asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString()); - config.Set("inventory_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort.ToString()); - config.Set("secure_inventory_server", "true"); } return defaultConfig; @@ -368,7 +355,6 @@ namespace OpenSim IConfig startupConfig = m_config.Source.Configs["Startup"]; if (startupConfig != null) { - m_configSettings.Standalone = !startupConfig.GetBoolean("gridmode", false); m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true); diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 299f519..10ff57d 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -122,8 +122,7 @@ namespace OpenSim m_log.Info("===================================================================="); m_log.Info("========================= STARTING OPENSIM ========================="); m_log.Info("===================================================================="); - m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", - (ConfigurationSettings.Standalone ? "sandbox" : "grid")); + m_log.InfoFormat("[OPENSIM MAIN]: Running "); //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); // http://msdn.microsoft.com/en-us/library/bb384202.aspx //GCSettings.LatencyMode = GCLatencyMode.Batch; @@ -353,16 +352,6 @@ namespace OpenSim "kill uuid ", "Kill an object by UUID", KillUUID); - - m_console.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [ ] ", - "Set local coordinate to map HG regions to", RunCommand); - m_console.Commands.AddCommand("hypergrid", false, "link-region", - "link-region :[:] ", - "Link a hypergrid region", RunCommand); - m_console.Commands.AddCommand("hypergrid", false, "unlink-region", - "unlink-region or : ", - "Unlink a hypergrid region", RunCommand); - } public override void ShutdownSpecific() -- cgit v1.1 From af265e001d3bf043590e480cd6574a14193f6de0 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 15 Feb 2010 19:15:03 +0900 Subject: Formatting cleanup. --- OpenSim/Region/Application/OpenSim.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index a86a831..96eceb0 100755 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -367,7 +367,6 @@ namespace OpenSim m_console.Commands.AddCommand("hypergrid", false, "unlink-region", "unlink-region or : ", "Unlink a hypergrid region", RunCommand); - } public override void ShutdownSpecific() @@ -433,7 +432,7 @@ namespace OpenSim // kick client... if (alert != null) presence.ControllingClient.Kick(alert); - else + else presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); // ...and close on our side @@ -640,7 +639,6 @@ namespace OpenSim } } - /// /// Load, Unload, and list Region modules in use /// @@ -972,7 +970,6 @@ namespace OpenSim scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, scene.RegionInfo.InternalEndPoint.Port)); - }); break; @@ -1097,7 +1094,7 @@ namespace OpenSim } else { - MainConsole.Instance.Output(string.Format("A user with the name {0} {1} already exists!", firstName, lastName)); + MainConsole.Instance.Output(string.Format("A user with the name {0} {1} already exists!", firstName, lastName)); } } -- cgit v1.1 From 842b68eeff7571d3c82415c65065bec3c95f34ea Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 18 Feb 2010 04:19:33 +0000 Subject: Change handling of the SYSTEMIP constant to be more sane. This will now choose the first network interface IP address, or the loopback interface if no external interfaces are found. It will log the IP address used as [NETWORK]: Using x.x.x.x for SYSTEMIP. --- OpenSim/Region/Application/OpenSim.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 96eceb0..05e283e 100755 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -190,6 +190,8 @@ namespace OpenSim PrintFileToConsole("startuplogo.txt"); + m_log.InfoFormat("[NETWORK]: Using {0} as SYSTEMIP", Util.GetLocalHost().ToString()); + // For now, start at the 'root' level by default if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it ChangeSelectedRegion("region", -- cgit v1.1