2 files changed, 52 insertions, 74 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index a5e56f9..5d80ba9 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -728,7 +728,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 responseData["success"] = true;
                 responseData["region_name"] = region.RegionName;
                 responseData["region_id"] = region.RegionID.ToString();
-                responseData["region_uuid"] = region.RegionID.ToString(); //Deprecate July 2012
 
                 m_log.Info("[RADMIN]: CreateRegion: request complete");
             }
@@ -1881,29 +1880,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 return;
             }
-            #region Deprecate July 2012
-            //region_ID, regionid, region_uuid will be deprecated in July 2012!!!!!!
-            else if (requestData.ContainsKey("regionid") &&
-                !String.IsNullOrEmpty((string)requestData["regionid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
-            }
-            else if (requestData.ContainsKey("region_ID") &&
-                !String.IsNullOrEmpty((string)requestData["region_ID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
-            }
-            else if (requestData.ContainsKey("regionID") &&
-                !String.IsNullOrEmpty((string)requestData["regionID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
-            }
-            else if (requestData.ContainsKey("region_uuid") &&
-                !String.IsNullOrEmpty((string)requestData["region_uuid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
-            }
-            #endregion
             else
             {
                 responseData["accepted"] = false;
@@ -1925,56 +1901,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     throw new Exception(String.Format("Region ID {0} not found", regionID));
                 }
             }
-            #region Deprecate July 2012
-            else if (requestData.ContainsKey("regionid") &&
-                !String.IsNullOrEmpty((string)requestData["regionid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["regionid"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            else if (requestData.ContainsKey("region_ID") &&
-                !String.IsNullOrEmpty((string)requestData["region_ID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["region_ID"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            else if (requestData.ContainsKey("regionID") &&
-                !String.IsNullOrEmpty((string)requestData["regionID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["regionID"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            else if (requestData.ContainsKey("region_uuid") &&
-                !String.IsNullOrEmpty((string)requestData["region_uuid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["region_uuid"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            #endregion
             else if (requestData.ContainsKey("region_name") &&
                 !String.IsNullOrEmpty((string)requestData["region_name"]))
             {
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index f079e00..96e9797 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -279,6 +279,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// in <see cref="Scene.ProcessObjectDeGrab"/>
         /// </remarks>
         public event ObjectDeGrabDelegate OnObjectDeGrab;
+
+        /// <summary>
+        /// Triggered when a script resets.
+        /// </summary>
+        /// <remarks>
+        /// Triggered by <see cref="TriggerScriptReset"/>
+        /// in <see cref="Scene.ProcessScriptReset"/>
+        /// via <see cref="OpenSim.Framework.IClientAPI.OnScriptReset"/>
+        /// via <see cref="OpenSim.Region.ClientStack.LindenUDP.LLClientView.HandleScriptReset"/>
+        /// </remarks>
         public event ScriptResetDelegate OnScriptReset;
 
         public event OnPermissionErrorDelegate OnPermissionError;
@@ -288,17 +298,50 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <remarks>
         /// Occurs after OnNewScript.
+        /// Triggered by <see cref="TriggerRezScript"/>
+        /// in <see cref="SceneObjectPartInventory.CreateScriptInstance"/>
         /// </remarks>
         public event NewRezScript OnRezScript;
         public delegate void NewRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource);
 
         public delegate void RemoveScript(uint localID, UUID itemID);
+
+        /// <summary>
+        /// Triggered when a script is removed from an object.
+        /// </summary>
+        /// <remarks>
+        /// Triggered by <see cref="TriggerRemoveScript"/>
+        /// in <see cref="Scene.RemoveTaskInventory"/>,
+        /// <see cref="Scene.CreateAgentInventoryItemFromTask"/>,
+        /// <see cref="SceneObjectPartInventory.RemoveScriptInstance"/>,
+        /// <see cref="SceneObjectPartInventory.RemoveInventoryItem"/>
+        /// </remarks>
         public event RemoveScript OnRemoveScript;
 
         public delegate void StartScript(uint localID, UUID itemID);
+
+        /// <summary>
+        /// Triggered when a script starts.
+        /// </summary>
+        /// <remarks>
+        /// Triggered by <see cref="TriggerStartScript"/>
+        /// in <see cref="Scene.SetScriptRunning"/>
+        /// via <see cref="OpenSim.Framework.IClientAPI.OnSetScriptRunning"/>,
+        /// via <see cref="OpenSim.Region.ClientStack.LindenUDP.HandleSetScriptRunning"/>
+        /// </remarks>
         public event StartScript OnStartScript;
 
         public delegate void StopScript(uint localID, UUID itemID);
+
+        /// <summary>
+        /// Triggered when a script stops.
+        /// </summary>
+        /// <remarks>
+        /// Triggered by <see cref="TriggerStopScript"/>,
+        /// in <see cref="SceneObjectPartInventory.CreateScriptInstance"/>,
+        /// <see cref="SceneObjectPartInventory.StopScriptInstance"/>,
+        /// <see cref="Scene.SetScriptRunning"/>
+        /// </remarks>
         public event StopScript OnStopScript;
 
         public delegate bool SceneGroupMoved(UUID groupID, Vector3 delta);
@@ -349,6 +392,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <remarks>
         /// Occurs before OnRezScript
+        /// Triggered by <see cref="TriggerNewScript"/>
+        /// in <see cref="Scene.RezScriptFromAgentInventory"/>,
+        /// <see cref="Scene.RezNewScript"/>
         /// </remarks>
         public event NewScript OnNewScript;
 
@@ -383,6 +429,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <remarks>
         /// Triggered after the scene receives a client's upload of an updated script and has stored it in an asset.
+        /// Triggered by <see cref="TriggerUpdateScript"/>
+        /// in <see cref="Scene.CapsUpdateTaskInventoryScriptAsset"/>
+        /// via <see cref="Scene.CapsUpdateTaskInventoryScriptAsset"/>
+        /// via <see cref="OpenSim.Region.ClientStack.Linden.BunchOfCaps.TaskScriptUpdated"/>
+        /// via <see cref="OpenSim.Region.ClientStack.Linden.TaskInventoryScriptUpdater.OnUpLoad"/>
+        /// via <see cref="OpenSim.Region.ClientStack.Linden.TaskInventoryScriptUpdater.uploaderCaps"/>
         /// </remarks>
         public event UpdateScript OnUpdateScript;