ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* break out 'xml2' deserialization from sog

Browse Source
This commit is contained in:
Justin Clarke Casey
2009-05-08 19:18:37 +00:00
parent c8d44971c4
commit 567e0d032c
8 changed files with 85 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
View File

@@ -25,16 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#region Header
// MetaEntity.cs
// User: bongiojp
//
// TODO:
// 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.
#endregion Header
using System;
using System.Collections.Generic;
using System.Drawing;
@@ -46,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;
@@ -98,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
/// </summary>
public MetaEntity(string objectXML, Scene scene, bool physics)
{
m_Entity = new SceneObjectGroup(objectXML);
m_Entity = SceneObjectSerializer.FromXml2Format(objectXML);
m_Entity.SetScene(scene);
Initialize(physics);
}