Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs

1 files changed, 79 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 57db4d6..9fcd5fe 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -177,6 +177,9 @@ namespace OpenSim.Region.Framework.Scenes
         public delegate void AvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID);
         public event AvatarEnteringNewParcel OnAvatarEnteringNewParcel;
 
+        public delegate void AvatarAppearanceChange(ScenePresence avatar);
+        public event AvatarAppearanceChange OnAvatarAppearanceChange;
+
         public event Action<ScenePresence> OnSignificantClientMovement;
 
         public delegate void IncomingInstantMessage(GridInstantMessage message);
@@ -188,10 +191,62 @@ namespace OpenSim.Region.Framework.Scenes
 
         public event ClientClosed OnClientClosed;
 
+        // Fired when a script is created
+        // The indication that a new script exists in this region.
+        public delegate void NewScript(UUID clientID, SceneObjectPart part, UUID itemID);
+        public event NewScript OnNewScript;
+        public virtual void TriggerNewScript(UUID clientID, SceneObjectPart part, UUID itemID)
+        {
+            NewScript handlerNewScript = OnNewScript;
+            if (handlerNewScript != null)
+            {
+                foreach (NewScript d in handlerNewScript.GetInvocationList())
+                {
+                    try
+                    {
+                        d(clientID, part, itemID);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[EVENT MANAGER]: Delegate for TriggerNewScript failed - continuing.  {0} {1}",
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+        }
+
+        //TriggerUpdateScript: triggered after Scene receives client's upload of updated script and stores it as asset
+        // An indication that the script has changed.
+        public delegate void UpdateScript(UUID clientID, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID);
+        public event UpdateScript OnUpdateScript;
+        public virtual void TriggerUpdateScript(UUID clientId, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID)
+        {
+            UpdateScript handlerUpdateScript = OnUpdateScript;
+            if (handlerUpdateScript != null)
+            {
+                foreach (UpdateScript d in handlerUpdateScript.GetInvocationList())
+                {
+                    try
+                    {
+                        d(clientId, itemId, primId, isScriptRunning, newAssetID);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[EVENT MANAGER]: Delegate for TriggerUpdateScript failed - continuing.  {0} {1}",
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+        } 
+
         /// <summary>
-        /// This is fired when a scene object property that a script might be interested in (such as color, scale or
-        /// inventory) changes.  Only enough information is sent for the LSL changed event
-        /// (see http://lslwiki.net/lslwiki/wakka.php?wakka=changed)
+        /// ScriptChangedEvent is fired when a scene object property that a script might be interested 
+        /// in (such as color, scale or inventory) changes.  Only enough information sent is for the LSL changed event.
+        /// This is not an indication that the script has changed (see OnUpdateScript for that). 
+        /// This event is sent to a script to tell it that some property changed on 
+        /// the object the script is in. See http://lslwiki.net/lslwiki/wakka.php?wakka=changed .
         /// </summary>
         public event ScriptChangedEvent OnScriptChangedEvent;
         public delegate void ScriptChangedEvent(uint localID, uint change);
@@ -1262,6 +1317,27 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public void TriggerAvatarAppearanceChanged(ScenePresence avatar)
+        {
+            AvatarAppearanceChange handler = OnAvatarAppearanceChange;
+            if (handler != null)
+            {
+                foreach (AvatarAppearanceChange d in handler.GetInvocationList())
+                {
+                    try
+                    {
+                        d(avatar);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[EVENT MANAGER]: Delegate for TriggerAvatarAppearanceChanged failed - continuing.  {0} {1}", 
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+        }
+
         public void TriggerIncomingInstantMessage(GridInstantMessage message)
         {
             IncomingInstantMessage handlerIncomingInstantMessage = OnIncomingInstantMessage;