ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert the use of direct data on xml decode, for now

Browse Source
This commit is contained in:
UbitUmarov
2020-05-18 04:31:11 +01:00
parent aca5728ab2
commit 28b22a4fc1
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/Framework/Scenes/UuidGatherer.cs
View File

@@ -798,6 +798,28 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="sceneObjectAsset"></param>
private void RecordSceneObjectAssetUuids(AssetBase sceneObjectAsset)
{
string xml = Utils.BytesToString(sceneObjectAsset.Data);
CoalescedSceneObjects coa;
if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
{
foreach (SceneObjectGroup sog in coa.Objects)
{
sog.TemporaryInstance = true;
AddForInspection(sog);
}
}
else
{
SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
if (null != sog)
{
sog.TemporaryInstance = true;
AddForInspection(sog);
}
}
/*
if (CoalescedSceneObjectsSerializer.TryFromXmlData(sceneObjectAsset.Data, out CoalescedSceneObjects coa))
{
foreach (SceneObjectGroup sog in coa.Objects)
@@ -815,6 +837,7 @@ namespace OpenSim.Region.Framework.Scenes
AddForInspection(sog);
}
}
*/
}
/// <summary>