From 8d995a5a5dd040c227b18ac8371d89f530a52194 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 13 Dec 2007 18:45:32 +0000 Subject: Minor cleanup --- OpenSim/Region/Application/OpenSimMain.cs | 9 --------- OpenSim/Region/ClientStack/ClientView.cs | 1 - OpenSim/Region/ClientStack/PacketServer.cs | 1 - OpenSim/Region/ClientStack/RegionApplicationBase.cs | 4 ++-- OpenSim/Region/ClientStack/UDPServer.cs | 1 + OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs | 4 ---- 6 files changed, 3 insertions(+), 17 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 1471f89..542c5cd 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -164,20 +164,13 @@ namespace OpenSim config.Set("physics", "basicphysics"); config.Set("verbose", true); config.Set("physical_prim", true); - config.Set("child_get_tasks", false); - config.Set("serverside_object_permissions", false); - config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); - config.Set("startup_console_commands_file", ""); config.Set("shutdown_console_commands_file", ""); - config.Set("script_engine", "DotNetEngine"); - config.Set("asset_database", "sqlite"); - } if (m_config.Configs["StandAlone"] == null) @@ -201,7 +194,6 @@ namespace OpenSim { config.Set("default_location_x", 1000); config.Set("default_location_y", 1000); - config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort); config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort); config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); @@ -214,7 +206,6 @@ namespace OpenSim config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); } - if (m_config.Configs["RemoteAdmin"] == null) m_config.AddConfig("RemoteAdmin"); config = m_config.Configs["RemoteAdmin"]; diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 653077f..0514df5 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -202,7 +202,6 @@ namespace OpenSim.Region.ClientStack # region Client Methods - public void Close() { // Pull Client out of Region diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs index e56a0b8..945bb82 100644 --- a/OpenSim/Region/ClientStack/PacketServer.cs +++ b/OpenSim/Region/ClientStack/PacketServer.cs @@ -104,7 +104,6 @@ namespace OpenSim.Region.ClientStack CloseClient(client); } - /// /// /// diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 82a5c3c..fd7e04f 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -128,8 +128,8 @@ namespace OpenSim.Region.ClientStack { masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, - scene.RegionInfo.MasterAvatarLastName, - scene.RegionInfo.MasterAvatarSandboxPassword); + scene.RegionInfo.MasterAvatarLastName, + scene.RegionInfo.MasterAvatarSandboxPassword); } if (masterAvatar != null) diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 21e4359..8095646 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs @@ -71,6 +71,7 @@ namespace OpenSim.Region.ClientStack } } + public ulong RegionHandle { get diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs index 86ddfaf..0b95aee 100644 --- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs +++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs @@ -67,7 +67,6 @@ namespace OpenSim.Region.Environment.Modules } } - public void Initialise(Scene scene, IConfigSource source) { scene.RegisterModuleInterface(this); @@ -136,7 +135,6 @@ namespace OpenSim.Region.Environment.Modules avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID; } } - } } } @@ -159,7 +157,5 @@ namespace OpenSim.Region.Environment.Modules } return visualParams; } - - } } -- cgit v1.1