aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs')
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs13
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
38using System; 28using System;
39using System.Collections.Generic; 29using System.Collections.Generic;
40using System.Drawing; 30using System.Drawing;
@@ -46,6 +36,7 @@ using Nini.Config;
46using OpenSim.Framework; 36using OpenSim.Framework;
47using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Scenes.Serialization;
49using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
50 41
51using log4net; 42using 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 }