diff options
author | Teravus Ovares | 2008-04-07 11:21:44 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-07 11:21:44 +0000 |
commit | 072b5faa34145b2437b35be30c54ca8e232f7a86 (patch) | |
tree | 3e5e6e9e044603ca753d71874dd9507234154004 | |
parent | * Committing SceneObjectPart XML Schemas in the share/Schemas folder (this i... (diff) | |
download | opensim-SC-072b5faa34145b2437b35be30c54ca8e232f7a86.zip opensim-SC-072b5faa34145b2437b35be30c54ca8e232f7a86.tar.gz opensim-SC-072b5faa34145b2437b35be30c54ca8e232f7a86.tar.bz2 opensim-SC-072b5faa34145b2437b35be30c54ca8e232f7a86.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 1 |
2 files changed, 2 insertions, 1 deletions
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 | |||
293 | { | 293 | { |
294 | m_scene = scene; | 294 | m_scene = scene; |
295 | m_regionHandle = regionHandle; | 295 | m_regionHandle = regionHandle; |
296 | 296 | ||
297 | StringReader sr = new StringReader(xmlData); | 297 | StringReader sr = new StringReader(xmlData); |
298 | XmlTextReader reader = new XmlTextReader(sr); | 298 | XmlTextReader reader = new XmlTextReader(sr); |
299 | reader.Read(); | 299 | 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 | |||
77 | /// </summary> | 77 | /// </summary> |
78 | protected TaskInventoryDictionary m_taskInventory = new TaskInventoryDictionary(); | 78 | protected TaskInventoryDictionary m_taskInventory = new TaskInventoryDictionary(); |
79 | 79 | ||
80 | [XmlIgnore] | ||
80 | public TaskInventoryDictionary TaskInventory | 81 | public TaskInventoryDictionary TaskInventory |
81 | { | 82 | { |
82 | get { return m_taskInventory; } | 83 | get { return m_taskInventory; } |