diff options
author | Diva Canto | 2009-08-06 16:41:24 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-06 16:41:24 -0700 |
commit | ea940d98f91b65e0fdc0619bc4e421d506813870 (patch) | |
tree | f681bce5520316dd5d27c240a95960fb1c2e70fd | |
parent | Remove the forge module patch insertion area from prebuild.xml (diff) | |
download | opensim-SC-ea940d98f91b65e0fdc0619bc4e421d506813870.zip opensim-SC-ea940d98f91b65e0fdc0619bc4e421d506813870.tar.gz opensim-SC-ea940d98f91b65e0fdc0619bc4e421d506813870.tar.bz2 opensim-SC-ea940d98f91b65e0fdc0619bc4e421d506813870.tar.xz |
Added ToXml2() to ISceneObject, so that components other than regions can use this abstraction.
-rw-r--r-- | OpenSim/Framework/ISceneObject.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
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; | |||
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
40 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.Framework.Scenes | 42 | namespace 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>"; |