mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 01:35:46 +08:00
* refactor: break some of xml2 serialization out of sog
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user