5 files changed, 57 insertions, 88 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 817736f..58de44e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1491,12 +1491,27 @@ namespace OpenSim.Region.Framework.Scenes
 //                    m_log.DebugFormat(
 //                        "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()", 
 //                        currentItem.Name, part.Name);
-                    IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
-                    if (agentTransactions != null)
+
+                    // Only look for an uploaded updated asset if we are passed a transaction ID.  This is only the
+                    // case for updates uploded through UDP.  Updates uploaded via a capability (e.g. a script update)
+                    // will not pass in a transaction ID in the update message.
+                    if (transactionID != UUID.Zero)
                     {
-                        agentTransactions.HandleTaskItemUpdateFromTransaction(
-                            remoteClient, part, transactionID, currentItem);
+                        IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
+                        if (agentTransactions != null)
+                        {
+                            agentTransactions.HandleTaskItemUpdateFromTransaction(
+                                remoteClient, part, transactionID, currentItem);
+    
+//                            if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
+//                                remoteClient.SendAgentAlertMessage("Notecard saved", false);
+//                            else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
+//                                remoteClient.SendAgentAlertMessage("Script saved", false);
+//                            else
+//                                remoteClient.SendAgentAlertMessage("Item saved", false);
+                        }
                     }
+
                     // Base ALWAYS has move
                     currentItem.BasePermissions |= (uint)PermissionMask.Move;
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0d14963..a6c234e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2781,10 +2781,6 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup == null)
                 return;
 
-            // When running OpenSim tests, Scene (and EventManager can be null).
-            // Need to fix tests before we can trigger this here
-            // ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
-
             ParentGroup.QueueForUpdateCheck();
 
             int timeNow = Util.UnixTimeSinceEpoch();
@@ -2806,6 +2802,9 @@ namespace OpenSim.Region.Framework.Scenes
             //            m_log.DebugFormat(
             //                "[SCENE OBJECT PART]: Scheduling full  update for {0}, {1} at {2}",
             //                UUID, Name, TimeStampFull);
+
+            if (ParentGroup.Scene != null)
+                ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
         }
 
         /// <summary>
@@ -2817,15 +2816,12 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup == null)
                 return;
 
-            // When running OpenSim tests, Scene (and EventManager can be null).
-            // Need to fix tests before we can trigger this here
-            // ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
-
             // This was pulled from SceneViewer. Attachments always receive full updates.
             // I could not verify if this is a requirement but this maintains existing behavior
             if (ParentGroup.IsAttachment)
             {
                 ScheduleFullUpdate();
+                return;
             }
 
             if (UpdateFlag == UpdateRequired.NONE)
@@ -2840,6 +2836,9 @@ namespace OpenSim.Region.Framework.Scenes
             //                    "[SCENE OBJECT PART]: Scheduling terse update for {0}, {1} at {2}",
             //                    UUID, Name, TimeStampTerse);
             }
+
+            if (ParentGroup.Scene != null)
+                ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
         }
 
         public void ScriptSetPhysicsStatus(bool UsePhysics)
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 6303cb1..ba33122 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -34,6 +34,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -276,14 +277,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
         #region manual serialization
 
-        private delegate void SOPXmlProcessor(SceneObjectPart sop, XmlTextReader reader);
-        private static Dictionary<string, SOPXmlProcessor> m_SOPXmlProcessors = new Dictionary<string, SOPXmlProcessor>();
+        private static Dictionary<string, Action<SceneObjectPart, XmlTextReader>> m_SOPXmlProcessors
+            = new Dictionary<string, Action<SceneObjectPart, XmlTextReader>>();
 
-        private delegate void TaskInventoryXmlProcessor(TaskInventoryItem item, XmlTextReader reader);
-        private static Dictionary<string, TaskInventoryXmlProcessor> m_TaskInventoryXmlProcessors = new Dictionary<string, TaskInventoryXmlProcessor>();
+        private static Dictionary<string, Action<TaskInventoryItem, XmlTextReader>> m_TaskInventoryXmlProcessors
+            = new Dictionary<string, Action<TaskInventoryItem, XmlTextReader>>();
 
-        private delegate void ShapeXmlProcessor(PrimitiveBaseShape shape, XmlTextReader reader);
-        private static Dictionary<string, ShapeXmlProcessor> m_ShapeXmlProcessors = new Dictionary<string, ShapeXmlProcessor>();
+        private static Dictionary<string, Action<PrimitiveBaseShape, XmlTextReader>> m_ShapeXmlProcessors
+            = new Dictionary<string, Action<PrimitiveBaseShape, XmlTextReader>>();
 
         static SceneObjectSerializer()
         {
@@ -1480,34 +1481,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             reader.ReadStartElement("SceneObjectPart");
 
-            string nodeName = string.Empty;
-            while (reader.NodeType != XmlNodeType.EndElement)
-            {
-                nodeName = reader.Name;
-                SOPXmlProcessor p = null;
-                if (m_SOPXmlProcessors.TryGetValue(reader.Name, out p))
-                {
-                    //m_log.DebugFormat("[XXX] Processing: {0}", reader.Name);
-                    try
-                    {
-                        p(obj, reader);
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.DebugFormat(
-                            "[SceneObjectSerializer]: exception while parsing {0} in object {1} {2}: {3}{4}",
-                            obj.Name, obj.UUID, nodeName, e.Message, e.StackTrace);
-                        if (reader.NodeType == XmlNodeType.EndElement)
-                            reader.Read();
-                    }
-                }
-                else
-                {
-//                    m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element {0}", nodeName);
-                    reader.ReadOuterXml(); // ignore
-                }
-
-            }
+            ExternalRepresentationUtils.ExecuteReadProcessors(
+                obj,
+                m_SOPXmlProcessors,
+                reader,
+                (o, nodeName, e)
+                    => m_log.ErrorFormat(
+                        "[SceneObjectSerializer]: Exception while parsing {0} in object {1} {2}: {3}{4}",
+                        ((SceneObjectPart)o).Name, ((SceneObjectPart)o).UUID, nodeName, e.Message, e.StackTrace));
 
             reader.ReadEndElement(); // SceneObjectPart
 
@@ -1526,17 +1507,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 reader.ReadStartElement("TaskInventoryItem", String.Empty); // TaskInventory
 
                 TaskInventoryItem item = new TaskInventoryItem();
-                while (reader.NodeType != XmlNodeType.EndElement)
-                {
-                    TaskInventoryXmlProcessor p = null;
-                    if (m_TaskInventoryXmlProcessors.TryGetValue(reader.Name, out p))
-                        p(item, reader);
-                    else
-                    {
-//                        m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in TaskInventory {0}, {1}", reader.Name, reader.Value);
-                        reader.ReadOuterXml();
-                    }
-                }
+
+                ExternalRepresentationUtils.ExecuteReadProcessors(
+                    item,
+                    m_TaskInventoryXmlProcessors,
+                    reader);
+
                 reader.ReadEndElement(); // TaskInventoryItem
                 tinv.Add(item.ItemID, item);
 
@@ -1563,35 +1539,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             reader.ReadStartElement(name, String.Empty); // Shape
 
-            string nodeName = string.Empty;
-            while (reader.NodeType != XmlNodeType.EndElement)
-            {
-                nodeName = reader.Name;
-                //m_log.DebugFormat("[XXX] Processing: {0}", reader.Name); 
-                ShapeXmlProcessor p = null;
-                if (m_ShapeXmlProcessors.TryGetValue(reader.Name, out p))
-                {
-                    try
-                    {
-                        p(shape, reader);
-                    }
-                    catch (Exception e)
-                    {
-                        errors = true;
-                        m_log.DebugFormat(
-                            "[SceneObjectSerializer]: exception while parsing Shape property {0}: {1}{2}",
-                            nodeName, e.Message, e.StackTrace);
-
-                        if (reader.NodeType == XmlNodeType.EndElement)
-                            reader.Read();
-                    }
-                }
-                else
-                {
-                    // m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name);
-                    reader.ReadOuterXml();
-                }
-            }
+            ExternalRepresentationUtils.ExecuteReadProcessors(
+                shape,
+                m_ShapeXmlProcessors,
+                reader,
+                (o, nodeName, e)
+                    => m_log.ErrorFormat(
+                        "[SceneObjectSerializer]: Exception while parsing Shape property {0}: {1}{2}",
+                        nodeName, e.Message, e.StackTrace));
 
             reader.ReadEndElement(); // Shape
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
index 6f99abd..c582cf6 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            log4net.Config.XmlConfigurator.Configure();
 
             UUID userId = TestHelpers.ParseTail(0x1);
-            UUID itemId = TestHelpers.ParseTail(0x2);
+//            UUID itemId = TestHelpers.ParseTail(0x2);
             string itemName = "Test Script Item";
 
             Scene scene = SceneHelpers.SetupScene();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index d4c299f..ed9b179 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
+//            UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
             
             TestScene myScene1 = SceneHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
             TestScene myScene2 = SceneHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);