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/OptionalModules/ContentManagementSystem/CMModel.cs | |
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/OptionalModules/ContentManagementSystem/CMModel.cs | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs index c9a760b..a4ee270 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs | |||
@@ -25,15 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #region Header | ||
29 | |||
30 | // CMModel.cs | ||
31 | // User: bongiojp | ||
32 | // | ||
33 | // | ||
34 | |||
35 | #endregion Header | ||
36 | |||
37 | using System; | 28 | using System; |
38 | using System.Collections; | 29 | using System.Collections; |
39 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
@@ -45,6 +36,7 @@ using OpenSim; | |||
45 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
46 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
47 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
48 | using OpenSim.Region.Physics.Manager; | 40 | using OpenSim.Region.Physics.Manager; |
49 | 41 | ||
50 | using log4net; | 42 | using log4net; |
@@ -211,14 +203,15 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
211 | 203 | ||
212 | foreach (string xml in xmllist) | 204 | foreach (string xml in xmllist) |
213 | { | 205 | { |
214 | try{ | 206 | try |
215 | temp = new SceneObjectGroup(xml); | 207 | { |
208 | temp = SceneObjectSerializer.FromXml2Format(xml); | ||
216 | temp.SetScene(scene); | 209 | temp.SetScene(scene); |
217 | foreach (SceneObjectPart part in temp.Children.Values) | 210 | foreach (SceneObjectPart part in temp.Children.Values) |
218 | part.RegionHandle = scene.RegionInfo.RegionHandle; | 211 | part.RegionHandle = scene.RegionInfo.RegionHandle; |
219 | ReplacementList.Add(temp.UUID, (EntityBase)temp); | 212 | ReplacementList.Add(temp.UUID, (EntityBase)temp); |
220 | } | 213 | } |
221 | catch(Exception e) | 214 | catch (Exception e) |
222 | { | 215 | { |
223 | m_log.Info("[CMMODEL]: Error while creating replacement list for rollback: " + e); | 216 | m_log.Info("[CMMODEL]: Error while creating replacement list for rollback: " + e); |
224 | } | 217 | } |