From f9807884a425c2d91e8f2035993a0ca5e210eb43 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 25 Nov 2009 15:28:43 +0000 Subject: [PATCH 1/6] Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid command line parsing --- CONTRIBUTORS.txt | 1 + .../World/Archiver/ArchiverModule.cs | 10 +++++++++- bin/NDesk.Options.dll | Bin 0 -> 22016 bytes prebuild.xml | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 bin/NDesk.Options.dll diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index ee263a118c..8744a08f58 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -158,6 +158,7 @@ This software uses components from the following developers: * Nini (http://nini.sourceforge.net/) * log4net (http://logging.apache.org/log4net/) * GlynnTucker.Cache (http://gtcache.sourceforge.net/) +* NDesk.Options 0.2.1 (http://www.ndesk.org/Options) Some plugins are based on Cable Beach Cable Beach is Copyright (c) 2008 Intel Corporation diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 181f4c66ce..98fdec3db6 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs @@ -26,9 +26,11 @@ */ using System; +using System.Collections.Generic; using System.IO; using System.Reflection; using log4net; +using NDesk.Options; using Nini.Config; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; @@ -91,7 +93,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver /// public void HandleLoadOarConsoleCommand(string module, string[] cmdparams) { - if (cmdparams.Length > 2) + OptionSet options = new OptionSet() {}; + List mainParams = options.Parse(cmdparams); + + foreach (string param in mainParams) + m_log.DebugFormat("Found param [{0}]", param); + + if (mainParams.Count > 2) { DearchiveRegion(cmdparams[2]); } diff --git a/bin/NDesk.Options.dll b/bin/NDesk.Options.dll new file mode 100644 index 0000000000000000000000000000000000000000..df458789570622f8283493ab3e6e5282b87398c6 GIT binary patch literal 22016 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 Z5;w5_-|>m7|7WDm&iwzM|K~jLzX3<;8NmPm literal 0 HcmV?d00001 diff --git a/prebuild.xml b/prebuild.xml index 26535fb606..ad0693847a 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1596,6 +1596,7 @@ + From c18422ad3a09cfabd86eb86403a77a6c720980f0 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 25 Nov 2009 16:02:47 +0000 Subject: [PATCH 2/6] Implement oar merging An oar can now be merged with existing region contents by using the --merge option For example, load oar --merge my.oar Existing terrain, region settings and parcel data is left in place when an oar is merged. See http://opensimulator.org/wiki/OpenSim_Archives#Usage for more information --- .../CoreModules/World/Archiver/ArchiverModule.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 98fdec3db6..27763bb7f3 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs @@ -93,19 +93,23 @@ namespace OpenSim.Region.CoreModules.World.Archiver /// public void HandleLoadOarConsoleCommand(string module, string[] cmdparams) { - OptionSet options = new OptionSet() {}; + bool mergeOar = false; + + OptionSet options = new OptionSet().Add("m|merge", delegate (string v) { mergeOar = v != null; }); List mainParams = options.Parse(cmdparams); - - foreach (string param in mainParams) - m_log.DebugFormat("Found param [{0}]", param); + +// m_log.DebugFormat("MERGE OAR IS [{0}]", mergeOar); +// +// foreach (string param in mainParams) +// m_log.DebugFormat("GOT PARAM [{0}]", param); if (mainParams.Count > 2) { - DearchiveRegion(cmdparams[2]); + DearchiveRegion(mainParams[2], mergeOar, Guid.Empty); } else { - DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME); + DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, mergeOar, Guid.Empty); } } From a4d2a97bc6ead3aeba4e1be419d976925e5ee470 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 25 Nov 2009 16:14:08 +0000 Subject: [PATCH 3/6] minor: remove some mono compiler warnings, add --merge load oar switch to help information --- OpenSim/Framework/Tests/CacheTests.cs | 8 +++++--- OpenSim/Region/Application/HGCommands.cs | 2 +- OpenSim/Region/Application/OpenSim.cs | 2 +- OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs index e2afd2a65a..32c0c9510a 100644 --- a/OpenSim/Framework/Tests/CacheTests.cs +++ b/OpenSim/Framework/Tests/CacheTests.cs @@ -78,8 +78,9 @@ namespace OpenSim.Framework.Tests foo[0] = 1; cachedItem.Store(foo); cache.Store(cacheItemUUID.ToString(), cachedItem); - - object citem = cache.Get(cacheItemUUID.ToString()); + + cache.Get(cacheItemUUID.ToString()); + //object citem = cache.Get(cacheItemUUID.ToString()); //Assert.That(citem == null, "Item should not be in Cache because the expiry time was before now"); } @@ -94,7 +95,8 @@ namespace OpenSim.Framework.Tests cachedItem.Store(foo); cache.Store(cacheItemUUID.ToString(), cachedItem); cache.Invalidate(ImmediateExpiryUUID.ToString()); - object citem = cache.Get(cacheItemUUID.ToString()); + cache.Get(cacheItemUUID.ToString()); + //object citem = cache.Get(cacheItemUUID.ToString()); //Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it"); } diff --git a/OpenSim/Region/Application/HGCommands.cs b/OpenSim/Region/Application/HGCommands.cs index f503db75c1..7ae161da3e 100644 --- a/OpenSim/Region/Application/HGCommands.cs +++ b/OpenSim/Region/Application/HGCommands.cs @@ -42,7 +42,7 @@ namespace OpenSim { public class HGCommands { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, CommunicationsManager m_commsManager, StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version) diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index f9be1e24a3..5228e4b30a 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -232,7 +232,7 @@ namespace OpenSim "Save named prim to XML2", SavePrimsXml2); m_console.Commands.AddCommand("region", false, "load oar", - "load oar ", + "load oar [--merge] ", "Load a region's data from OAR archive", LoadOar); m_console.Commands.AddCommand("region", false, "save oar", diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index cd59bdb613..f4da910db4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -57,7 +57,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat #region ISharedRegionModule Members public virtual void Initialise(IConfigSource config) { - m_config = config.Configs["Chat"]; if (null == m_config) From 40464f6cc6ffc04bb5e4ede3d832e1cde75e9b5b Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 25 Nov 2009 16:23:37 +0000 Subject: [PATCH 4/6] Change chat config code so that enabled = false actually does disable the chat module --- OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index f4da910db4..6dacbba0df 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -62,15 +62,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat if (null == m_config) { m_log.Info("[CHAT]: no config found, plugin disabled"); + m_enabled = false; return; } - if (!m_config.GetBoolean("enabled", false)) + if (!m_config.GetBoolean("enabled", true)) { m_log.Info("[CHAT]: plugin disabled by configuration"); + m_enabled = false; return; } - m_enabled = true; m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); From 0b380f68d81267550b5adf45e16378e4648df933 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 25 Nov 2009 17:01:41 +0000 Subject: [PATCH 5/6] Change osTeleportAgent parameters from long to int. That numerical range is not even supported by the underlying type, so there is no need to ask for a type the script can not even supply. --- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 ++-- OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 7fdbac8d86..e72fa70d8a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -636,13 +636,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } // Teleport functions - public void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) + public void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) { // High because there is no security check. High griefer potential // CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"); - ulong regionHandle = Util.UIntsToLong((regionX * (uint)Constants.RegionSize), (regionY * (uint)Constants.RegionSize)); + ulong regionHandle = Util.UIntsToLong(((uint)regionX * (uint)Constants.RegionSize), ((uint)regionY * (uint)Constants.RegionSize)); m_host.AddScriptLPS(1); UUID agentId = new UUID(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 2a403bf0fe..470946a76e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces // Teleport commands void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); - void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); + void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); // Animation commands diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 4928e904b3..6b888344fc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -201,9 +201,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase m_OSSL_Functions.osTeleportAgent(agent, regionName, position, lookat); } - public void osTeleportAgent(string agent, long regionX, long regionY, vector position, vector lookat) + public void osTeleportAgent(string agent, int regionX, int regionY, vector position, vector lookat) { - m_OSSL_Functions.osTeleportAgent(agent, (uint) regionX, (uint) regionY, position, lookat); + m_OSSL_Functions.osTeleportAgent(agent, regionX, regionY, position, lookat); } public void osTeleportAgent(string agent, vector position, vector lookat) From 59caa68e08691d8fac221e2bd42c712d5bcf69aa Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 25 Nov 2009 17:49:38 +0000 Subject: [PATCH 6/6] minor: add doc to a few parcel methods --- .../ArchiveWriteRequestPreparation.cs | 10 ++++++++ .../CoreModules/World/Land/LandChannel.cs | 3 ++- .../World/Land/LandManagementModule.cs | 12 ++++++++- .../Framework/Interfaces/ILandChannel.cs | 25 +++++++++++++++---- .../RegionCombinerLargeLandChannel.cs | 1 + 5 files changed, 44 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index f08d8eced5..71bfe57db9 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs @@ -93,6 +93,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver List entities = m_scene.GetEntities(); List sceneObjects = new List(); + /* + foreach (ILandObject lo in m_scene.LandChannel.AllParcels()) + { + if (name == lo.LandData.Name) + { + // This is the parcel we want + } + } + */ + // Filter entities so that we only have scene objects. // FIXME: Would be nicer to have this as a proper list in SceneGraph, since lots of methods // end up having to do this diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs index 4ed23bb8ba..81024db979 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs @@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.World.Land ILandObject obj = new LandObject(UUID.Zero, false, m_scene); obj.LandData.Name = "NO LAND"; return obj; - } + } public List AllParcels() { @@ -154,6 +154,7 @@ namespace OpenSim.Region.CoreModules.World.Land m_landManagementModule.UpdateLandObject(localID, data); } } + public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) { if (m_landManagementModule != null) diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 968f46a50f..9a2ef5003d 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -67,7 +67,14 @@ namespace OpenSim.Region.CoreModules.World.Land private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; #pragma warning restore 0429 + /// + /// Local land ids at specified region co-ordinates (region size / 4) + /// private readonly int[,] m_landIDList = new int[landArrayMax, landArrayMax]; + + /// + /// Land objects keyed by local id + /// private readonly Dictionary m_landList = new Dictionary(); private bool m_landPrimCountTainted; @@ -570,6 +577,7 @@ namespace OpenSim.Region.CoreModules.World.Land if (x_float > Constants.RegionSize || x_float <= 0 || y_float > Constants.RegionSize || y_float <= 0) return null; + try { x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / 4.0)); @@ -584,6 +592,7 @@ namespace OpenSim.Region.CoreModules.World.Land { return null; } + lock (m_landList) { // Corner case. If an autoreturn happens during sim startup @@ -603,6 +612,7 @@ namespace OpenSim.Region.CoreModules.World.Land // they happen every time at border crossings throw new Exception("Error: Parcel not found at point " + x + ", " + y); } + lock (m_landIDList) { try @@ -617,7 +627,7 @@ namespace OpenSim.Region.CoreModules.World.Land return null; } } - } + } #endregion diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs index 74f404fc6b..6fe6118179 100644 --- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs @@ -33,26 +33,41 @@ namespace OpenSim.Region.Framework.Interfaces { public interface ILandChannel { - List ParcelsNearPoint(Vector3 position); + /// + /// Get all parcels + /// + /// List AllParcels(); /// - /// Get the land object at the specified point + /// Get the parcel at the specified point /// /// Value between 0 - 256 on the x axis of the point /// Value between 0 - 256 on the y axis of the point /// Land object at the point supplied ILandObject GetLandObject(int x, int y); - ILandObject GetLandObject(int localID); - /// - /// Get the land object at the specified point + /// Get the parcel at the specified point /// /// Value between 0 - 256 on the x axis of the point /// Value between 0 - 256 on the y axis of the point /// Land object at the point supplied ILandObject GetLandObject(float x, float y); + + /// + /// Get the parcels near the specified point + /// + /// + /// + List ParcelsNearPoint(Vector3 position); + + /// + /// Get the parcel given the land's local id. + /// + /// + /// + ILandObject GetLandObject(int localID); bool IsLandPrimCountTainted(); bool IsForcefulBansAllowed(); diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs index 146ec660c5..9da818a7eb 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs @@ -118,6 +118,7 @@ public class RegionCombinerLargeLandChannel : ILandChannel return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY); } } + ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene); obj.LandData.Name = "NO LAND"; return obj;