aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-14 16:33:04 +0000
committerJustin Clarke Casey2009-05-14 16:33:04 +0000
commitd10b5e29bcef7335d38d4cbb590b60b7b171897b (patch)
tree957624c5fb9bdda9b715320fd477d771e0883717 /OpenSim/Framework
parentRemove empty server dirs to break the mold and allow a new structure to evolve (diff)
downloadopensim-SC_OLD-d10b5e29bcef7335d38d4cbb590b60b7b171897b.zip
opensim-SC_OLD-d10b5e29bcef7335d38d4cbb590b60b7b171897b.tar.gz
opensim-SC_OLD-d10b5e29bcef7335d38d4cbb590b60b7b171897b.tar.bz2
opensim-SC_OLD-d10b5e29bcef7335d38d4cbb590b60b7b171897b.tar.xz
* refactor: break some of xml2 serialization out of sog
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Clients/RegionClient.cs8
-rw-r--r--OpenSim/Framework/ISceneObject.cs3
2 files changed, 7 insertions, 4 deletions
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
362 return true; 362 return true;
363 } 363 }
364 364
365 public bool DoCreateObjectCall(RegionInfo region, ISceneObject sog, bool allowScriptCrossing) 365 public bool DoCreateObjectCall(RegionInfo region, ISceneObject sog, string sogXml2, bool allowScriptCrossing)
366 { 366 {
367 ulong regionHandle = GetRegionHandle(region.RegionHandle); 367 ulong regionHandle = GetRegionHandle(region.RegionHandle);
368 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/"; 368 string uri
369 = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort
370 + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/";
369 //m_log.Debug(" >>> DoCreateChildAgentCall <<< " + uri); 371 //m_log.Debug(" >>> DoCreateChildAgentCall <<< " + uri);
370 372
371 WebRequest ObjectCreateRequest = WebRequest.Create(uri); 373 WebRequest ObjectCreateRequest = WebRequest.Create(uri);
@@ -374,7 +376,7 @@ namespace OpenSim.Framework.Communications.Clients
374 ObjectCreateRequest.Timeout = 10000; 376 ObjectCreateRequest.Timeout = 10000;
375 377
376 OSDMap args = new OSDMap(2); 378 OSDMap args = new OSDMap(2);
377 args["sog"] = OSD.FromString(sog.ToXmlString2()); 379 args["sog"] = OSD.FromString(sogXml2);
378 args["extra"] = OSD.FromString(sog.ExtraToXmlString()); 380 args["extra"] = OSD.FromString(sog.ExtraToXmlString());
379 if (allowScriptCrossing) 381 if (allowScriptCrossing)
380 { 382 {
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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Xml;
28using OpenMetaverse; 29using OpenMetaverse;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
@@ -33,7 +34,7 @@ namespace OpenSim.Framework
33 { 34 {
34 UUID UUID { get; } 35 UUID UUID { get; }
35 ISceneObject CloneForNewScene(); 36 ISceneObject CloneForNewScene();
36 string ToXmlString2(); 37 void ToXml2(XmlTextWriter writer);
37 string ExtraToXmlString(); 38 string ExtraToXmlString();
38 void ExtraFromXmlString(string xmlstr); 39 void ExtraFromXmlString(string xmlstr);
39 string GetStateSnapshot(); 40 string GetStateSnapshot();