diff options
author | Justin Clarke Casey | 2009-05-14 16:33:04 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-14 16:33:04 +0000 |
commit | d10b5e29bcef7335d38d4cbb590b60b7b171897b (patch) | |
tree | 957624c5fb9bdda9b715320fd477d771e0883717 /OpenSim/Framework/Communications/Clients | |
parent | Remove empty server dirs to break the mold and allow a new structure to evolve (diff) | |
download | opensim-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/Communications/Clients')
-rw-r--r-- | OpenSim/Framework/Communications/Clients/RegionClient.cs | 8 |
1 files changed, 5 insertions, 3 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 | { |