diff options
author | Justin Clarke Casey | 2009-05-08 19:18:37 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-08 19:18:37 +0000 |
commit | 567e0d032c56b2d1498216416fa6874ec77dd55b (patch) | |
tree | ef63642c32a558c1a47f4fd9143fdbdf25d1e5f3 /OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | |
parent | Implement an ingenious solution to pacekt pool performance suggested by (diff) | |
download | opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.zip opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.gz opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.bz2 opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.xz |
* break out 'xml2' deserialization from sog
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | 12 |
1 files changed, 2 insertions, 10 deletions
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 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #region Header | ||
29 | |||
30 | // ContentManagementEntity.cs | ||
31 | // User: bongiojp | ||
32 | // | ||
33 | // | ||
34 | |||
35 | #endregion Header | ||
36 | |||
37 | using System; | 28 | using System; |
38 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
39 | using System.Drawing; | 30 | using System.Drawing; |
@@ -45,6 +36,7 @@ using Nini.Config; | |||
45 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
46 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
47 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
48 | using OpenSim.Region.Physics.Manager; | 40 | using OpenSim.Region.Physics.Manager; |
49 | 41 | ||
50 | using log4net; | 42 | using log4net; |
@@ -87,7 +79,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
87 | public ContentManagementEntity(string objectXML, Scene scene, bool physics) | 79 | public ContentManagementEntity(string objectXML, Scene scene, bool physics) |
88 | : base(objectXML, scene, false) | 80 | : base(objectXML, scene, false) |
89 | { | 81 | { |
90 | m_UnchangedEntity = new SceneObjectGroup(objectXML); | 82 | m_UnchangedEntity = SceneObjectSerializer.FromXml2Format(objectXML); |
91 | } | 83 | } |
92 | 84 | ||
93 | #endregion Constructors | 85 | #endregion Constructors |