diff options
| author | Melanie | 2009-08-07 03:05:46 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-07 03:05:46 +0100 |
| commit | e49abf446aff77fb809a0222ad0adaf4b37f3cf9 (patch) | |
| tree | 140251676b090bed41af22f87b804a6bd8bcf540 /OpenSim/Region/Framework | |
| parent | Revert the XEngine memleak patch, it causes premature GC. (diff) | |
| parent | HGAuthenticationService must be a singleton, because it has in-memory state. ... (diff) | |
| download | opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.zip opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.gz opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.bz2 opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 6 insertions, 0 deletions
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>"; |