aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 30f7151..4934b83 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -250,7 +250,7 @@ namespace OpenSim.Region.Framework.Scenes
250 } 250 }
251 251
252 foreach (TaskInventoryItem item in m_items.Values) 252 foreach (TaskInventoryItem item in m_items.Values)
253 item.GroupID = groupID; 253 item.GroupID = groupID;
254 254
255 m_items.LockItemsForWrite(false); 255 m_items.LockItemsForWrite(false);
256 } 256 }
@@ -455,7 +455,6 @@ namespace OpenSim.Region.Framework.Scenes
455 if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID)) 455 if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID))
456 { 456 {
457 XmlDocument doc = new XmlDocument(); 457 XmlDocument doc = new XmlDocument();
458 doc.XmlResolver=null;
459 doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]); 458 doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]);
460 459
461 ////////// CRUFT WARNING /////////////////////////////////// 460 ////////// CRUFT WARNING ///////////////////////////////////
@@ -1454,7 +1453,7 @@ namespace OpenSim.Region.Framework.Scenes
1454 { 1453 {
1455 if (item.InvType == (int)InventoryType.LSL) 1454 if (item.InvType == (int)InventoryType.LSL)
1456 count++; 1455 count++;
1457 } 1456 }
1458 m_items.LockItemsForRead(false); 1457 m_items.LockItemsForRead(false);
1459 return count; 1458 return count;
1460 } 1459 }
@@ -1479,9 +1478,9 @@ namespace OpenSim.Region.Framework.Scenes
1479 { 1478 {
1480 if (engine.GetScriptState(item.ItemID)) 1479 if (engine.GetScriptState(item.ItemID))
1481 count++; 1480 count++;
1481 }
1482 } 1482 }
1483 } 1483 }
1484 }
1485 return count; 1484 return count;
1486 } 1485 }
1487 1486