aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs16
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
48 private static int cmdHandlerThreadCycleSleepms; 48 private static int cmdHandlerThreadCycleSleepms;
49 49
50 private static List<IScene> m_Scenes = new List<IScene>(); 50 private static List<IScene> m_Scenes = new List<IScene>();
51 private static List<IScriptEngine> m_ScriptEngines = 51 private static List<IEventReceiver> m_ScriptEngines =
52 new List<IScriptEngine>(); 52 new List<IEventReceiver>();
53 53
54 public IScriptEngine m_ScriptEngine; 54 public IEventReceiver m_ScriptEngine;
55 private IScene m_Scene; 55 private IScene m_Scene;
56 56
57 private static Dictionary<IScene, Dataserver> m_Dataserver = 57 private static Dictionary<IScene, Dataserver> m_Dataserver =
@@ -97,12 +97,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
97 get { return m_XmlRequest[m_Scene]; } 97 get { return m_XmlRequest[m_Scene]; }
98 } 98 }
99 99
100 public IScriptEngine[] ScriptEngines 100 public IEventReceiver[] ScriptEngines
101 { 101 {
102 get { return m_ScriptEngines.ToArray(); } 102 get { return m_ScriptEngines.ToArray(); }
103 } 103 }
104 104
105 public AsyncCommandManager(IScriptEngine _ScriptEngine) 105 public AsyncCommandManager(IEventReceiver _ScriptEngine)
106 { 106 {
107 m_ScriptEngine = _ScriptEngine; 107 m_ScriptEngine = _ScriptEngine;
108 m_Scene = m_ScriptEngine.World; 108 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
1629 LSL_Vector currentPos = llGetLocalPos(); 1629 LSL_Vector currentPos = llGetLocalPos();
1630 if (llVecDist(currentPos, targetPos) > 10.0f * m_ScriptDistanceFactor) 1630 if (llVecDist(currentPos, targetPos) > 10.0f * m_ScriptDistanceFactor)
1631 { 1631 {
1632 targetPos = currentPos + m_ScriptDistanceFactor * 10 * llVecNorm(targetPos - currentPos); 1632 targetPos = currentPos + m_ScriptDistanceFactor * 10.0f * llVecNorm(targetPos - currentPos);
1633 } 1633 }
1634 1634
1635 if (part.ParentID != 0) 1635 if (part.ParentID != 0)
@@ -2230,28 +2230,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2230 public void llMakeExplosion() 2230 public void llMakeExplosion()
2231 { 2231 {
2232 m_host.AddScriptLPS(1); 2232 m_host.AddScriptLPS(1);
2233 NotImplemented("llMakeExplosion"); 2233 Deprecated("llMakeExplosion");
2234 // ScriptSleep(100); 2234 // ScriptSleep(100);
2235 } 2235 }
2236 2236
2237 public void llMakeFountain() 2237 public void llMakeFountain()
2238 { 2238 {
2239 m_host.AddScriptLPS(1); 2239 m_host.AddScriptLPS(1);
2240 NotImplemented("llMakeFountain"); 2240 Deprecated("llMakeFountain");
2241 // ScriptSleep(100); 2241 // ScriptSleep(100);
2242 } 2242 }
2243 2243
2244 public void llMakeSmoke() 2244 public void llMakeSmoke()
2245 { 2245 {
2246 m_host.AddScriptLPS(1); 2246 m_host.AddScriptLPS(1);
2247 NotImplemented("llMakeSmoke"); 2247 Deprecated("llMakeSmoke");
2248 // ScriptSleep(100); 2248 // ScriptSleep(100);
2249 } 2249 }
2250 2250
2251 public void llMakeFire() 2251 public void llMakeFire()
2252 { 2252 {
2253 m_host.AddScriptLPS(1); 2253 m_host.AddScriptLPS(1);
2254 NotImplemented("llMakeFire"); 2254 Deprecated("llMakeFire");
2255 // ScriptSleep(100); 2255 // ScriptSleep(100);
2256 } 2256 }
2257 2257
@@ -2261,7 +2261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2261 2261
2262 if (Double.IsNaN(rot.x) || Double.IsNaN(rot.y) || Double.IsNaN(rot.z) || Double.IsNaN(rot.s)) 2262 if (Double.IsNaN(rot.x) || Double.IsNaN(rot.y) || Double.IsNaN(rot.z) || Double.IsNaN(rot.s))
2263 return; 2263 return;
2264 float dist = (float)llVecMag(llGetPos() - pos); 2264 float dist = (float)llVecDist(llGetPos(), pos);
2265 2265
2266 if (dist > m_ScriptDistanceFactor * 10.0f) 2266 if (dist > m_ScriptDistanceFactor * 10.0f)
2267 return; 2267 return;
@@ -2563,7 +2563,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2563 public void llSoundPreload() 2563 public void llSoundPreload()
2564 { 2564 {
2565 m_host.AddScriptLPS(1); 2565 m_host.AddScriptLPS(1);
2566 NotImplemented("llSoundPreload"); 2566 Deprecated("llSoundPreload");
2567 } 2567 }
2568 2568
2569 public void llRotLookAt(LSL_Rotation target, double strength, double damping) 2569 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
@@ -5284,7 +5284,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5284 public void llSetRemoteScriptAccessPin(int pin) 5284 public void llSetRemoteScriptAccessPin(int pin)
5285 { 5285 {
5286 m_host.AddScriptLPS(1); 5286 m_host.AddScriptLPS(1);
5287 NotImplemented("llSetRemoteScriptAccessPin"); 5287 m_host.ScriptAccessPin = pin;
5288 } 5288 }
5289 5289
5290 public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param) 5290 public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param)