Merge branch 'master' into careminster

1 files changed, 28 insertions, 28 deletions

diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index f1d8cb4..8f0b866 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -181,14 +181,14 @@ namespace OpenSim.Region.Framework.Scenes
 
         public delegate void ScriptNotAtTargetEvent(uint localID);
 
-        public event ScriptNotAtTargetEvent OnScriptNotAtTargetEvent;

-

-        public delegate void ScriptAtRotTargetEvent(uint localID, uint handle, Quaternion targetrot, Quaternion atrot);

-

-        public event ScriptAtRotTargetEvent OnScriptAtRotTargetEvent;

-

-        public delegate void ScriptNotAtRotTargetEvent(uint localID);

-

+        public event ScriptNotAtTargetEvent OnScriptNotAtTargetEvent;
+
+        public delegate void ScriptAtRotTargetEvent(uint localID, uint handle, Quaternion targetrot, Quaternion atrot);
+
+        public event ScriptAtRotTargetEvent OnScriptAtRotTargetEvent;
+
+        public delegate void ScriptNotAtRotTargetEvent(uint localID);
+
         public event ScriptNotAtRotTargetEvent OnScriptNotAtRotTargetEvent;
 
         public delegate void ScriptColliding(uint localID, ColliderArgs colliders);
@@ -395,8 +395,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         private ScriptChangedEvent handlerScriptChangedEvent = null; //OnScriptChangedEvent;
         private ScriptAtTargetEvent handlerScriptAtTargetEvent = null;
-        private ScriptNotAtTargetEvent handlerScriptNotAtTargetEvent = null;

-        private ScriptAtRotTargetEvent handlerScriptAtRotTargetEvent = null;

+        private ScriptNotAtTargetEvent handlerScriptNotAtTargetEvent = null;
+        private ScriptAtRotTargetEvent handlerScriptAtRotTargetEvent = null;
         private ScriptNotAtRotTargetEvent handlerScriptNotAtRotTargetEvent = null;
         private ClientMovement handlerClientMovement = null; //OnClientMovement;
         private OnPermissionErrorDelegate handlerPermissionError = null; //OnPermissionError;
@@ -883,24 +883,24 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 handlerScriptNotAtTargetEvent(localID);
             }
-        }

-

-        public void TriggerAtRotTargetEvent(uint localID, uint handle, Quaternion targetrot, Quaternion currentrot)

-        {

-            handlerScriptAtRotTargetEvent = OnScriptAtRotTargetEvent;

-            if (handlerScriptAtRotTargetEvent != null)

-            {

-                handlerScriptAtRotTargetEvent(localID, handle, targetrot, currentrot);

-            }

-        }

-

-        public void TriggerNotAtRotTargetEvent(uint localID)

-        {

-            handlerScriptNotAtRotTargetEvent = OnScriptNotAtRotTargetEvent;

-            if (handlerScriptNotAtRotTargetEvent != null)

-            {

-                handlerScriptNotAtRotTargetEvent(localID);

-            }

+        }
+
+        public void TriggerAtRotTargetEvent(uint localID, uint handle, Quaternion targetrot, Quaternion currentrot)
+        {
+            handlerScriptAtRotTargetEvent = OnScriptAtRotTargetEvent;
+            if (handlerScriptAtRotTargetEvent != null)
+            {
+                handlerScriptAtRotTargetEvent(localID, handle, targetrot, currentrot);
+            }
+        }
+
+        public void TriggerNotAtRotTargetEvent(uint localID)
+        {
+            handlerScriptNotAtRotTargetEvent = OnScriptNotAtRotTargetEvent;
+            if (handlerScriptNotAtRotTargetEvent != null)
+            {
+                handlerScriptNotAtRotTargetEvent(localID);
+            }
         }
 
         public void TriggerRequestChangeWaterHeight(float height)