Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

This commit is contained in:
Melanie
2009-08-07 03:05:46 +01:00
5 changed files with 13 additions and 2 deletions

View File

@@ -37,6 +37,7 @@ using OpenMetaverse.Packets;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Physics.Manager;
using OpenSim.Region.Framework.Scenes.Serialization;
namespace OpenSim.Region.Framework.Scenes
{
@@ -3366,6 +3367,11 @@ namespace OpenSim.Region.Framework.Scenes
return sog;
}
public virtual string ToXml2()
{
return SceneObjectSerializer.ToXml2Format(this);
}
public virtual string ExtraToXmlString()
{
return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>";