aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2009-08-07 03:05:46 +0100
committerMelanie2009-08-07 03:05:46 +0100
commite49abf446aff77fb809a0222ad0adaf4b37f3cf9 (patch)
tree140251676b090bed41af22f87b804a6bd8bcf540 /OpenSim/Region/Framework/Scenes
parentRevert the XEngine memleak patch, it causes premature GC. (diff)
parentHGAuthenticationService must be a singleton, because it has in-memory state. ... (diff)
downloadopensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.zip
opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.gz
opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.bz2
opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
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;
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>";