diff options
author | Justin Clarke Casey | 2009-05-08 19:18:37 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-08 19:18:37 +0000 |
commit | 567e0d032c56b2d1498216416fa6874ec77dd55b (patch) | |
tree | ef63642c32a558c1a47f4fd9143fdbdf25d1e5f3 /OpenSim/Region/CoreModules | |
parent | Implement an ingenious solution to pacekt pool performance suggested by (diff) | |
download | opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.zip opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.gz opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.bz2 opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.xz |
* break out 'xml2' deserialization from sog
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs index 80dced7..6ad3b73 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs | |||
@@ -41,6 +41,7 @@ using OpenSim.Framework.Communications.Clients; | |||
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | using OpenSim.Region.Framework.Scenes.Hypergrid; | 43 | using OpenSim.Region.Framework.Scenes.Hypergrid; |
44 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
44 | 45 | ||
45 | namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion | 46 | namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion |
46 | { | 47 | { |
@@ -641,7 +642,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion | |||
641 | SceneObjectGroup sog = null; | 642 | SceneObjectGroup sog = null; |
642 | try | 643 | try |
643 | { | 644 | { |
644 | sog = new SceneObjectGroup(sogXmlStr); | 645 | sog = SceneObjectSerializer.FromXml2Format(sogXmlStr); |
645 | sog.ExtraFromXmlString(extraStr); | 646 | sog.ExtraFromXmlString(extraStr); |
646 | } | 647 | } |
647 | catch (Exception ex) | 648 | catch (Exception ex) |