aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/ContentManagementSystem
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/OptionalModules/ContentManagementSystem
parentImplement an ingenious solution to pacekt pool performance suggested by (diff)
downloadopensim-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 'OpenSim/Region/OptionalModules/ContentManagementSystem')
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs17
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs12
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs13
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs10
4 files changed, 9 insertions, 43 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
37using System; 28using System;
38using System.Collections; 29using System.Collections;
39using System.Collections.Generic; 30using System.Collections.Generic;
@@ -45,6 +36,7 @@ using OpenSim;
45using OpenSim.Framework; 36using OpenSim.Framework;
46using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Scenes.Serialization;
48using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
49 41
50using log4net; 42using 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 }
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
index 4d65038..cbd2a6f 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.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// ContentManagementEntity.cs
31// User: bongiojp
32//
33//
34
35#endregion Header
36
37using System; 28using System;
38using System.Collections.Generic; 29using System.Collections.Generic;
39using System.Drawing; 30using System.Drawing;
@@ -45,6 +36,7 @@ using Nini.Config;
45using OpenSim.Framework; 36using OpenSim.Framework;
46using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Scenes.Serialization;
48using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
49 41
50using log4net; 42using log4net;
@@ -87,7 +79,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
87 public ContentManagementEntity(string objectXML, Scene scene, bool physics) 79 public ContentManagementEntity(string objectXML, Scene scene, bool physics)
88 : base(objectXML, scene, false) 80 : base(objectXML, scene, false)
89 { 81 {
90 m_UnchangedEntity = new SceneObjectGroup(objectXML); 82 m_UnchangedEntity = SceneObjectSerializer.FromXml2Format(objectXML);
91 } 83 }
92 84
93 #endregion Constructors 85 #endregion Constructors
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
index 7ff58da..184c55a 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
@@ -25,16 +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// MetaEntity.cs
31// User: bongiojp
32//
33// TODO:
34// Create a physics manager to the meta object if there isn't one or the object knows of no scene but the user wants physics enabled.
35
36#endregion Header
37
38using System; 28using System;
39using System.Collections.Generic; 29using System.Collections.Generic;
40using System.Drawing; 30using System.Drawing;
@@ -46,6 +36,7 @@ using Nini.Config;
46using OpenSim.Framework; 36using OpenSim.Framework;
47using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Scenes.Serialization;
49using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
50 41
51using log4net; 42using log4net;
@@ -98,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
98 /// </summary> 89 /// </summary>
99 public MetaEntity(string objectXML, Scene scene, bool physics) 90 public MetaEntity(string objectXML, Scene scene, bool physics)
100 { 91 {
101 m_Entity = new SceneObjectGroup(objectXML); 92 m_Entity = SceneObjectSerializer.FromXml2Format(objectXML);
102 m_Entity.SetScene(scene); 93 m_Entity.SetScene(scene);
103 Initialize(physics); 94 Initialize(physics);
104 } 95 }
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs
index 22f09fd..da3ba46 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs
@@ -25,16 +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// PointMetaEntity.cs created with MonoDevelop
31// User: bongiojp at 3:03 PMĀ 8/6/2008
32//
33// To change standard headers go to Edit->Preferences->Coding->Standard Headers
34//
35
36#endregion Header
37
38using System; 28using System;
39using System.Collections.Generic; 29using System.Collections.Generic;
40using System.Drawing; 30using System.Drawing;