From 64547c23add3f1aca0fdd3c6a4849e89d4a0fb83 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Aug 2010 04:04:16 +1000 Subject: [PATCH] * Some minor cleanups * Will commit the next set of changes tommorow containing the RegionData changes for permanently storing ComponentState data (n.b. they currently save/load via the ToXml/FromXml methods used by OARs and Inventory fine). * This is very spammy code, but will attach a component to every SOP in every scene on startup. The source for the component can be seen in TestComponent - a more detailed example is coming soon. --- .../ClientStack/LindenUDP/LLClientView.cs | 2 +- .../Scenes/Components/ComponentState.cs | 2 +- .../Scenes/Components/IComponentState.cs | 18 ------------------ .../World/TestComponent/TestComponent.cs | 8 -------- 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 OpenSim/Region/Framework/Scenes/Components/IComponentState.cs diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 2007727752..d1c8ad9aa1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -648,7 +648,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { // Make sure that we see any exception caused by the asynchronous operation. m_log.Error( - string.Format("[LLCLIENTVIEW]: Caught exception while processing {0} {1} STACK: {2}", packetObject.Pack, e.ToString(),e.StackTrace), e); + string.Format("[LLCLIENTVIEW]: Caught exception while processing {0} {1}", packetObject.Pack, e.ToString()), e); } } diff --git a/OpenSim/Region/Framework/Scenes/Components/ComponentState.cs b/OpenSim/Region/Framework/Scenes/Components/ComponentState.cs index bb9832df03..3377d668ed 100644 --- a/OpenSim/Region/Framework/Scenes/Components/ComponentState.cs +++ b/OpenSim/Region/Framework/Scenes/Components/ComponentState.cs @@ -5,7 +5,7 @@ using System.Runtime.Serialization; namespace OpenSim.Region.Framework.Scenes.Components { [Serializable] - public class ComponentState : IComponentState + public class ComponentState { private readonly Dictionary m_stateData = new Dictionary(); diff --git a/OpenSim/Region/Framework/Scenes/Components/IComponentState.cs b/OpenSim/Region/Framework/Scenes/Components/IComponentState.cs deleted file mode 100644 index f7cafb70af..0000000000 --- a/OpenSim/Region/Framework/Scenes/Components/IComponentState.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace OpenSim.Region.Framework.Scenes.Components -{ - public interface IComponentState - { - /// - /// - /// - /// - /// A serializable type - void Set(string name, T data); - - T Get(string name); - - bool TryGet(string name, out T data); - - string Serialise(); - } -} diff --git a/OpenSim/Region/OptionalModules/World/TestComponent/TestComponent.cs b/OpenSim/Region/OptionalModules/World/TestComponent/TestComponent.cs index 1f6b971712..1e4ee531aa 100644 --- a/OpenSim/Region/OptionalModules/World/TestComponent/TestComponent.cs +++ b/OpenSim/Region/OptionalModules/World/TestComponent/TestComponent.cs @@ -18,14 +18,6 @@ namespace OpenSim.Region.OptionalModules.World.TestComponent #region Implementation of IComponent - /// - /// Components MUST have a parameterless constructor - /// - public TestComponent() - { - - } - public TestComponent(ComponentState state) { m_log.Info("Its alive!");