From 567e0d032c56b2d1498216416fa6874ec77dd55b Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 8 May 2009 19:18:37 +0000 Subject: * break out 'xml2' deserialization from sog --- .../ContentManagementSystem/ContentManagementEntity.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs') diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs index 4d65038..cbd2a6f 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs @@ -25,15 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#region Header - -// ContentManagementEntity.cs -// User: bongiojp -// -// - -#endregion Header - using System; using System.Collections.Generic; using System.Drawing; @@ -45,6 +36,7 @@ using Nini.Config; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Scenes.Serialization; using OpenSim.Region.Physics.Manager; using log4net; @@ -87,7 +79,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement public ContentManagementEntity(string objectXML, Scene scene, bool physics) : base(objectXML, scene, false) { - m_UnchangedEntity = new SceneObjectGroup(objectXML); + m_UnchangedEntity = SceneObjectSerializer.FromXml2Format(objectXML); } #endregion Constructors -- cgit v1.1