Rename lots of stuff in DNE to reduce source code differences in the

LSL implementation files. Rename lots of stuff in XEngine for the same
reason. Move methods between interfaces. Just refactor stuff.

2 files changed, 13 insertions, 13 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index fabcc2c..020e64a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -48,10 +48,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         private static int cmdHandlerThreadCycleSleepms;
 
         private static List<IScene> m_Scenes = new List<IScene>();
-        private static List<IScriptEngine> m_ScriptEngines =
-                new List<IScriptEngine>();
+        private static List<IEventReceiver> m_ScriptEngines =
+                new List<IEventReceiver>();
 
-        public IScriptEngine m_ScriptEngine;
+        public IEventReceiver m_ScriptEngine;
         private IScene m_Scene;
 
         private static Dictionary<IScene, Dataserver> m_Dataserver =
@@ -97,12 +97,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             get { return m_XmlRequest[m_Scene]; }
         }
 
-        public IScriptEngine[] ScriptEngines
+        public IEventReceiver[] ScriptEngines
         {
             get { return m_ScriptEngines.ToArray(); }
         }
 
-        public AsyncCommandManager(IScriptEngine _ScriptEngine)
+        public AsyncCommandManager(IEventReceiver _ScriptEngine)
         {
             m_ScriptEngine = _ScriptEngine;
             m_Scene = m_ScriptEngine.World;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 552d47c..f40b1a5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1629,7 +1629,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             LSL_Vector currentPos = llGetLocalPos();
             if (llVecDist(currentPos, targetPos) > 10.0f * m_ScriptDistanceFactor)
             {
-                targetPos = currentPos + m_ScriptDistanceFactor * 10 * llVecNorm(targetPos - currentPos);
+                targetPos = currentPos + m_ScriptDistanceFactor * 10.0f * llVecNorm(targetPos - currentPos);
             }
 
             if (part.ParentID != 0)
@@ -2230,28 +2230,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llMakeExplosion()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llMakeExplosion");
+            Deprecated("llMakeExplosion");
             // ScriptSleep(100);
         }
 
         public void llMakeFountain()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llMakeFountain");
+            Deprecated("llMakeFountain");
             // ScriptSleep(100);
         }
 
         public void llMakeSmoke()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llMakeSmoke");
+            Deprecated("llMakeSmoke");
             // ScriptSleep(100);
         }
 
         public void llMakeFire()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llMakeFire");
+            Deprecated("llMakeFire");
             // ScriptSleep(100);
         }
 
@@ -2261,7 +2261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (Double.IsNaN(rot.x) || Double.IsNaN(rot.y) || Double.IsNaN(rot.z) || Double.IsNaN(rot.s))
                 return;
-            float dist = (float)llVecMag(llGetPos() - pos);
+            float dist = (float)llVecDist(llGetPos(), pos);
 
             if (dist > m_ScriptDistanceFactor * 10.0f)
                 return;
@@ -2563,7 +2563,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSoundPreload()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llSoundPreload");
+            Deprecated("llSoundPreload");
         }
 
         public void llRotLookAt(LSL_Rotation target, double strength, double damping)
@@ -5284,7 +5284,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetRemoteScriptAccessPin(int pin)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llSetRemoteScriptAccessPin");
+            m_host.ScriptAccessPin = pin;
         }
 
         public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param)