diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs index 7ff58da..184c55a 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs | |||
@@ -25,16 +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 | // MetaEntity.cs | ||
31 | // User: bongiojp | ||
32 | // | ||
33 | // TODO: | ||
34 | // Create a physics manager to the meta object if there isn't one or the object knows of no scene but the user wants physics enabled. | ||
35 | |||
36 | #endregion Header | ||
37 | |||
38 | using System; | 28 | using System; |
39 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
40 | using System.Drawing; | 30 | using System.Drawing; |
@@ -46,6 +36,7 @@ using Nini.Config; | |||
46 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
47 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
48 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
49 | using OpenSim.Region.Physics.Manager; | 40 | using OpenSim.Region.Physics.Manager; |
50 | 41 | ||
51 | using log4net; | 42 | using log4net; |
@@ -98,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
98 | /// </summary> | 89 | /// </summary> |
99 | public MetaEntity(string objectXML, Scene scene, bool physics) | 90 | public MetaEntity(string objectXML, Scene scene, bool physics) |
100 | { | 91 | { |
101 | m_Entity = new SceneObjectGroup(objectXML); | 92 | m_Entity = SceneObjectSerializer.FromXml2Format(objectXML); |
102 | m_Entity.SetScene(scene); | 93 | m_Entity.SetScene(scene); |
103 | Initialize(physics); | 94 | Initialize(physics); |
104 | } | 95 | } |