aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-08 19:18:37 +0000
committerJustin Clarke Casey2009-05-08 19:18:37 +0000
commit567e0d032c56b2d1498216416fa6874ec77dd55b (patch)
treeef63642c32a558c1a47f4fd9143fdbdf25d1e5f3 /OpenSim/Region/CoreModules
parentImplement an ingenious solution to pacekt pool performance suggested by (diff)
downloadopensim-SC-567e0d032c56b2d1498216416fa6874ec77dd55b.zip
opensim-SC-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.gz
opensim-SC-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.bz2
opensim-SC-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.xz
* break out 'xml2' deserialization from sog
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs3
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;
41using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
43using OpenSim.Region.Framework.Scenes.Hypergrid; 43using OpenSim.Region.Framework.Scenes.Hypergrid;
44using OpenSim.Region.Framework.Scenes.Serialization;
44 45
45namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion 46namespace 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)