aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2007-08-15 16:52:24 +0000
committerAdam Frisby2007-08-15 16:52:24 +0000
commitbf60577e5755b5ca19986d41edd5d1d41392547f (patch)
tree0d3eecedcced4574f813406bd60eacca8778b3b8 /OpenSim
parent* New LSL functions (diff)
downloadopensim-SC-bf60577e5755b5ca19986d41edd5d1d41392547f.zip
opensim-SC-bf60577e5755b5ca19986d41edd5d1d41392547f.tar.gz
opensim-SC-bf60577e5755b5ca19986d41edd5d1d41392547f.tar.bz2
opensim-SC-bf60577e5755b5ca19986d41edd5d1d41392547f.tar.xz
* Fixed bug with llModPow
* Implemented llSleep * Implemented llGetEnergy (always returns 1.0) * Implemented llGetRegionName * Implemented llGetRegionTimeDilation (always returns 1.0) * Implemented llGetRegionFPS (always returns 10.0)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index 14a9536..b411a20 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
157 public void llLookAt(Axiom.Math.Vector3 target, float strength, float damping) { } 157 public void llLookAt(Axiom.Math.Vector3 target, float strength, float damping) { }
158 public void llStopLookAt() { } 158 public void llStopLookAt() { }
159 public void llSetTimerEvent(float sec) { } 159 public void llSetTimerEvent(float sec) { }
160 public void llSleep(float sec) { } 160 public void llSleep(float sec) { System.Threading.Thread.Sleep((int)(sec * 1000)); }
161 public float llGetMass() { return 0; } 161 public float llGetMass() { return 0; }
162 public void llCollisionFilter(string name, string id, Int32 accept) { } 162 public void llCollisionFilter(string name, string id, Int32 accept) { }
163 public void llTakeControls(Int32 controls, Int32 accept, Int32 pass_on) { } 163 public void llTakeControls(Int32 controls, Int32 accept, Int32 pass_on) { }
@@ -198,7 +198,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
198 public Int32 llGetInventoryNumber(Int32 type) { return 0; } 198 public Int32 llGetInventoryNumber(Int32 type) { return 0; }
199 public string llGetInventoryName(Int32 type, Int32 number) { return ""; } 199 public string llGetInventoryName(Int32 type, Int32 number) { return ""; }
200 public void llSetScriptState(string name, Int32 run) { } 200 public void llSetScriptState(string name, Int32 run) { }
201 public float llGetEnergy() { return 0; } 201 public float llGetEnergy() { return 1.0f; }
202 public void llGiveInventory(string destination, string inventory) { } 202 public void llGiveInventory(string destination, string inventory) { }
203 public void llRemoveInventory(string item) { } 203 public void llRemoveInventory(string item) { }
204 public void llSetText(string text, Axiom.Math.Vector3 color, float alpha) { } 204 public void llSetText(string text, Axiom.Math.Vector3 color, float alpha) { }
@@ -275,9 +275,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
275 public Axiom.Math.Vector3 llGroundContour(Axiom.Math.Vector3 offset) { return new Axiom.Math.Vector3(); } 275 public Axiom.Math.Vector3 llGroundContour(Axiom.Math.Vector3 offset) { return new Axiom.Math.Vector3(); }
276 public Int32 llGetAttached() { return 0; } 276 public Int32 llGetAttached() { return 0; }
277 public Int32 llGetFreeMemory() { return 0; } 277 public Int32 llGetFreeMemory() { return 0; }
278 public string llGetRegionName() { return ""; } 278 public string llGetRegionName() { return World.RegionInfo.RegionName; }
279 public float llGetRegionTimeDilation() { return 0; } 279 public float llGetRegionTimeDilation() { return 1.0f; }
280 public float llGetRegionFPS() { return 0; } 280 public float llGetRegionFPS() { return 10.0f; }
281 public void llParticleSystem(List<Object> rules) { } 281 public void llParticleSystem(List<Object> rules) { }
282 public void llGroundRepel(float height, Int32 water, float tau) { } 282 public void llGroundRepel(float height, Int32 water, float tau) { }
283 public void llGiveInventoryList() { } 283 public void llGiveInventoryList() { }
@@ -360,7 +360,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
360 Int64 tmp = 0; 360 Int64 tmp = 0;
361 Int64 val = Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp); 361 Int64 val = Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp);
362 362
363 return Convert.ToInt32(val); 363 return Convert.ToInt32(tmp);
364 } 364 }
365 365
366 public Int32 llGetInventoryType(string name) { return 0; } 366 public Int32 llGetInventoryType(string name) { return 0; }