ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Okay you can put down your pitchforks - this patch should fix rezzing of items (with inventory) on Windows

Browse Source 
* Now properly dealing with prims which don't contain items - thanks to thomas for the patch which gave insight into this situation
* Also, an xml exception no longer crahes the client session    
* Leaving in debugging lines in case there are further problems
* Not yet tested on Linux, though I'm just about to.
This commit is contained in:
Justin Clarke Casey
2008-04-07 16:30:29 +00:00
parent 2b23734a16
commit 2caea75aa8
3 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@@ -296,36 +296,46 @@ namespace OpenSim.Region.Environment.Scenes
StringReader sr = new StringReader(xmlData);
XmlTextReader reader = new XmlTextReader(sr);
reader.Read();
reader.ReadStartElement("SceneObjectGroup");
reader.ReadStartElement("RootPart");
m_rootPart = SceneObjectPart.FromXml(reader);
AddPart(m_rootPart);
// m_log.DebugFormat("[SCENE OBJECT GROUP]: Current node {0}", reader.Name);
reader.ReadEndElement();
while (reader.Read())
try
{
switch (reader.NodeType)
reader.Read();
reader.ReadStartElement("SceneObjectGroup");
reader.ReadStartElement("RootPart");
m_rootPart = SceneObjectPart.FromXml(reader);
AddPart(m_rootPart);
m_log.DebugFormat("[SCENE OBJECT GROUP]: Current node {0}", reader.Name);
reader.ReadEndElement();
while (reader.Read())
{
case XmlNodeType.Element:
if (reader.Name == "Part")
{
reader.Read();
SceneObjectPart part = SceneObjectPart.FromXml(reader);
part.LocalId = m_scene.PrimIDAllocate();
AddPart(part);
part.RegionHandle = m_regionHandle;
part.TrimPermissions();
}
break;
case XmlNodeType.EndElement:
break;
switch (reader.NodeType)
{
case XmlNodeType.Element:
if (reader.Name == "Part")
{
reader.Read();
SceneObjectPart part = SceneObjectPart.FromXml(reader);
part.LocalId = m_scene.PrimIDAllocate();
AddPart(part);
part.RegionHandle = m_regionHandle;
part.TrimPermissions();
}
break;
case XmlNodeType.EndElement:
break;
}
}
}
catch (XmlException e)
{
m_log.ErrorFormat("[SCENE OBJECT GROUP]: Deserialization of following xml failed, {0}", xmlData);
// Let's see if carrying on does anything for us
}
reader.Close();
sr.Close();

1
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@@ -77,7 +77,6 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
protected TaskInventoryDictionary m_taskInventory = new TaskInventoryDictionary();
[XmlIgnore]
public TaskInventoryDictionary TaskInventory
{
get { return m_taskInventory; }