From 072b5faa34145b2437b35be30c54ca8e232f7a86 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Mon, 7 Apr 2008 11:21:44 +0000
Subject: * I XmlIgnored the TaskInventory Property as a temporary measure.
Taking things and rezzing them works again. (though, I suggest waiting on
taking things until justincc has an opportunity to look at the TaskInventory
property causing the XML Serialization to overrun.) It's MinOccurs is 0 in
the XML Schema, so it should work fine when he adds it back.
---
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 +-
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 0e2a4ee..e2ba681 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -293,7 +293,7 @@ namespace OpenSim.Region.Environment.Scenes
{
m_scene = scene;
m_regionHandle = regionHandle;
-
+
StringReader sr = new StringReader(xmlData);
XmlTextReader reader = new XmlTextReader(sr);
reader.Read();
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 16da516..395c8c6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -77,6 +77,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
protected TaskInventoryDictionary m_taskInventory = new TaskInventoryDictionary();
+ [XmlIgnore]
public TaskInventoryDictionary TaskInventory
{
get { return m_taskInventory; }
--
cgit v1.1