From d10b5e29bcef7335d38d4cbb590b60b7b171897b Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 14 May 2009 16:33:04 +0000
Subject: * refactor: break some of xml2 serialization out of sog

---
 OpenSim/Framework/Communications/Clients/RegionClient.cs | 8 +++++---
 OpenSim/Framework/ISceneObject.cs                        | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs
index fb1dc19..5c2babc 100644
--- a/OpenSim/Framework/Communications/Clients/RegionClient.cs
+++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs
@@ -362,10 +362,12 @@ namespace OpenSim.Framework.Communications.Clients
             return true;
         }
 
-        public bool DoCreateObjectCall(RegionInfo region, ISceneObject sog, bool allowScriptCrossing)
+        public bool DoCreateObjectCall(RegionInfo region, ISceneObject sog, string sogXml2, bool allowScriptCrossing)
         {
             ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/";
+            string uri 
+                = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort 
+                    + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/";
             //m_log.Debug("   >>> DoCreateChildAgentCall <<< " + uri);
 
             WebRequest ObjectCreateRequest = WebRequest.Create(uri);
@@ -374,7 +376,7 @@ namespace OpenSim.Framework.Communications.Clients
             ObjectCreateRequest.Timeout = 10000;
 
             OSDMap args = new OSDMap(2);
-            args["sog"] = OSD.FromString(sog.ToXmlString2());
+            args["sog"] = OSD.FromString(sogXml2);
             args["extra"] = OSD.FromString(sog.ExtraToXmlString());
             if (allowScriptCrossing)
             {
diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs
index c327b05..2162cb9 100644
--- a/OpenSim/Framework/ISceneObject.cs
+++ b/OpenSim/Framework/ISceneObject.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Xml;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -33,7 +34,7 @@ namespace OpenSim.Framework
     {
         UUID UUID { get; }
         ISceneObject CloneForNewScene();
-        string ToXmlString2();
+        void ToXml2(XmlTextWriter writer);
         string ExtraToXmlString();
         void ExtraFromXmlString(string xmlstr);
         string GetStateSnapshot();
-- 
cgit v1.1