OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: rename xml sog serialization method for readability

0.6.5-rc1
Justin Clarke Casey 2009-05-08 16:44:00 +00:00
parent 032e3b49eb
commit fcfc97a4bf
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
View File

@ -255,7 +255,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
if ((asset != null) && ((AssetType)asset.Type == AssetType.Object)) if ((asset != null) && ((AssetType)asset.Type == AssetType.Object))
{ {
string ass_str = Utils.BytesToString(asset.Data); string ass_str = Utils.BytesToString(asset.Data);
SceneObjectGroup sog = SceneObjectSerializer.DeserializeOriginalXmlFormat(ass_str); SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(ass_str);
SniffTextureUUIDs(uuids, sog); SniffTextureUUIDs(uuids, sog);

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -2265,7 +2265,7 @@ namespace OpenSim.Region.Framework.Scenes
string xmlData = Utils.BytesToString(rezAsset.Data); string xmlData = Utils.BytesToString(rezAsset.Data);
SceneObjectGroup group SceneObjectGroup group
= SceneObjectSerializer.DeserializeOriginalXmlFormat(itemId, xmlData); = SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData);
if (!Permissions.CanRezObject( if (!Permissions.CanRezObject(
group.Children.Count, remoteClient.AgentId, pos) group.Children.Count, remoteClient.AgentId, pos)
@ -2421,7 +2421,7 @@ namespace OpenSim.Region.Framework.Scenes
if (rezAsset != null) if (rezAsset != null)
{ {
string xmlData = Utils.BytesToString(rezAsset.Data); string xmlData = Utils.BytesToString(rezAsset.Data);
SceneObjectGroup group = SceneObjectSerializer.DeserializeOriginalXmlFormat(xmlData); SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
if (!Permissions.CanRezObject(group.Children.Count, ownerID, pos)) if (!Permissions.CanRezObject(group.Children.Count, ownerID, pos))
{ {

2
OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes
rootNode = doc.FirstChild; rootNode = doc.FirstChild;
foreach (XmlNode aPrimNode in rootNode.ChildNodes) foreach (XmlNode aPrimNode in rootNode.ChildNodes)
{ {
SceneObjectGroup obj = SceneObjectSerializer.DeserializeOriginalXmlFormat(aPrimNode.OuterXml); SceneObjectGroup obj = SceneObjectSerializer.FromOriginalXmlFormat(aPrimNode.OuterXml);
if (newIDS) if (newIDS)
{ {

6
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -49,9 +49,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
/// </summary> /// </summary>
/// <param name="serialization"></param> /// <param name="serialization"></param>
/// <returns></returns> /// <returns></returns>
public static SceneObjectGroup DeserializeOriginalXmlFormat(string serialization) public static SceneObjectGroup FromOriginalXmlFormat(string serialization)
{ {
return DeserializeOriginalXmlFormat(UUID.Zero, serialization); return FromOriginalXmlFormat(UUID.Zero, serialization);
} }
/// <summary> /// <summary>
@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
/// </summary> /// </summary>
/// <param name="serialization"></param> /// <param name="serialization"></param>
/// <returns></returns> /// <returns></returns>
public static SceneObjectGroup DeserializeOriginalXmlFormat(UUID fromUserInventoryItemID, string serialization) public static SceneObjectGroup FromOriginalXmlFormat(UUID fromUserInventoryItemID, string serialization)
{ {
//m_log.DebugFormat("[SOG]: Starting deserialization of SOG"); //m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
//int time = System.Environment.TickCount; //int time = System.Environment.TickCount;

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

@ -264,7 +264,7 @@ namespace OpenSim.Region.Framework.Scenes
if (null != objectAsset) if (null != objectAsset)
{ {
string xml = Utils.BytesToString(objectAsset.Data); string xml = Utils.BytesToString(objectAsset.Data);
SceneObjectGroup sog = SceneObjectSerializer.DeserializeOriginalXmlFormat(xml); SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
GatherAssetUuids(sog, assetUuids); GatherAssetUuids(sog, assetUuids);
} }
} }