aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-08-06 16:41:24 -0700
committerDiva Canto2009-08-06 16:41:24 -0700
commitea940d98f91b65e0fdc0619bc4e421d506813870 (patch)
treef681bce5520316dd5d27c240a95960fb1c2e70fd
parentRemove the forge module patch insertion area from prebuild.xml (diff)
downloadopensim-SC_OLD-ea940d98f91b65e0fdc0619bc4e421d506813870.zip
opensim-SC_OLD-ea940d98f91b65e0fdc0619bc4e421d506813870.tar.gz
opensim-SC_OLD-ea940d98f91b65e0fdc0619bc4e421d506813870.tar.bz2
opensim-SC_OLD-ea940d98f91b65e0fdc0619bc4e421d506813870.tar.xz
Added ToXml2() to ISceneObject, so that components other than regions can use this abstraction.
-rw-r--r--OpenSim/Framework/ISceneObject.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
2 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs
index 14a338e..db19527 100644
--- a/OpenSim/Framework/ISceneObject.cs
+++ b/OpenSim/Framework/ISceneObject.cs
@@ -34,6 +34,7 @@ namespace OpenSim.Framework
34 { 34 {
35 UUID UUID { get; } 35 UUID UUID { get; }
36 ISceneObject CloneForNewScene(); 36 ISceneObject CloneForNewScene();
37 string ToXml2();
37 string ExtraToXmlString(); 38 string ExtraToXmlString();
38 void ExtraFromXmlString(string xmlstr); 39 void ExtraFromXmlString(string xmlstr);
39 string GetStateSnapshot(); 40 string GetStateSnapshot();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 21e133b..c86e4a1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -37,6 +37,7 @@ using OpenMetaverse.Packets;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
40using OpenSim.Region.Framework.Scenes.Serialization;
40 41
41namespace OpenSim.Region.Framework.Scenes 42namespace OpenSim.Region.Framework.Scenes
42{ 43{
@@ -3366,6 +3367,11 @@ namespace OpenSim.Region.Framework.Scenes
3366 return sog; 3367 return sog;
3367 } 3368 }
3368 3369
3370 public virtual string ToXml2()
3371 {
3372 return SceneObjectSerializer.ToXml2Format(this);
3373 }
3374
3369 public virtual string ExtraToXmlString() 3375 public virtual string ExtraToXmlString()
3370 { 3376 {
3371 return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>"; 3377 return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>";