aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
diff options
context:
space:
mode:
authorAdam Frisby2007-08-15 16:44:00 +0000
committerAdam Frisby2007-08-15 16:44:00 +0000
commitceb1c12bd166b2e69d9cfff91a78e38727f4b60d (patch)
tree1263f646a6cae0b18a41bdd06fbf17fe676d3db0 /OpenSim/Region/ScriptEngine/DotNetEngine
parent* Division of parcel boundaries occurs in double space rather than decimal. (diff)
downloadopensim-SC_OLD-ceb1c12bd166b2e69d9cfff91a78e38727f4b60d.zip
opensim-SC_OLD-ceb1c12bd166b2e69d9cfff91a78e38727f4b60d.tar.gz
opensim-SC_OLD-ceb1c12bd166b2e69d9cfff91a78e38727f4b60d.tar.bz2
opensim-SC_OLD-ceb1c12bd166b2e69d9cfff91a78e38727f4b60d.tar.xz
* New LSL functions
+ llAsin / llAcos + llMD5String + llModPow + llGetUnixTime
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_Interface.cs2
2 files changed, 17 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 b95321f..14a9536 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -221,8 +221,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
221 public Axiom.Math.Quaternion llAxisAngle2Rot(Axiom.Math.Vector3 axis, float angle) { return new Axiom.Math.Quaternion(); } 221 public Axiom.Math.Quaternion llAxisAngle2Rot(Axiom.Math.Vector3 axis, float angle) { return new Axiom.Math.Quaternion(); }
222 public Axiom.Math.Vector3 llRot2Axis(Axiom.Math.Quaternion rot) { return new Axiom.Math.Vector3(); } 222 public Axiom.Math.Vector3 llRot2Axis(Axiom.Math.Quaternion rot) { return new Axiom.Math.Vector3(); }
223 public void llRot2Angle() { } 223 public void llRot2Angle() { }
224 public float llAcos(float val) { return 0; } 224 public float llAcos(float val) { return (float)Math.Acos(val); }
225 public float llAsin(float val) { return 0; } 225 public float llAsin(float val) { return (float)Math.Asin(val); }
226 public float llAngleBetween(Axiom.Math.Quaternion a, Axiom.Math.Quaternion b) { return 0; } 226 public float llAngleBetween(Axiom.Math.Quaternion a, Axiom.Math.Quaternion b) { return 0; }
227 public string llGetInventoryKey(string name) { return ""; } 227 public string llGetInventoryKey(string name) { return ""; }
228 public void llAllowInventoryDrop(Int32 add) { } 228 public void llAllowInventoryDrop(Int32 add) { }
@@ -311,7 +311,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
311 public string llSendRemoteData(string channel, string dest, Int32 idata, string sdata) { return ""; } 311 public string llSendRemoteData(string channel, string dest, Int32 idata, string sdata) { return ""; }
312 public void llRemoteDataReply(string channel, string message_id, string sdata, Int32 idata) { } 312 public void llRemoteDataReply(string channel, string message_id, string sdata, Int32 idata) { }
313 public void llCloseRemoteDataChannel(string channel) { } 313 public void llCloseRemoteDataChannel(string channel) { }
314 public void llMD5String(string src, Int32 nonce) { } 314 public string llMD5String(string src, Int32 nonce) {
315 return OpenSim.Framework.Utilities.Util.Md5Hash(src + ":" + nonce.ToString());
316 }
315 public void llSetPrimitiveParams() { } 317 public void llSetPrimitiveParams() { }
316 public string llStringToBase64(string str) { return ""; } 318 public string llStringToBase64(string str) { return ""; }
317 public string llBase64ToString(string str) { return ""; } 319 public string llBase64ToString(string str) { return ""; }
@@ -353,7 +355,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
353 public void llLoadURL(string avatar_id, string message, string url) { } 355 public void llLoadURL(string avatar_id, string message, string url) { }
354 public void llParcelMediaCommandList() { } 356 public void llParcelMediaCommandList() { }
355 public void llParcelMediaQuery() { } 357 public void llParcelMediaQuery() { }
356 public Int32 llModPow(Int32 a, Int32 b, Int32 c) { return 0; } 358
359 public Int32 llModPow(Int32 a, Int32 b, Int32 c) {
360 Int64 tmp = 0;
361 Int64 val = Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp);
362
363 return Convert.ToInt32(val);
364 }
365
357 public Int32 llGetInventoryType(string name) { return 0; } 366 public Int32 llGetInventoryType(string name) { return 0; }
358 public void llSetPayPrice() { } 367 public void llSetPayPrice() { }
359 public Axiom.Math.Vector3 llGetCameraPos() { return new Axiom.Math.Vector3(); } 368 public Axiom.Math.Vector3 llGetCameraPos() { return new Axiom.Math.Vector3(); }
@@ -369,7 +378,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
369 public void llSetCameraParams() { } 378 public void llSetCameraParams() { }
370 public void llClearCameraParams() { } 379 public void llClearCameraParams() { }
371 public void llListStatistics() { } 380 public void llListStatistics() { }
372 public Int32 llGetUnixTime() { return 0; } 381 public Int32 llGetUnixTime() {
382 return OpenSim.Framework.Utilities.Util.UnixTimeSinceEpoch();
383 }
373 public Int32 llGetParcelFlags(Axiom.Math.Vector3 pos) { return 0; } 384 public Int32 llGetParcelFlags(Axiom.Math.Vector3 pos) { return 0; }
374 public Int32 llGetRegionFlags() { return 0; } 385 public Int32 llGetRegionFlags() { return 0; }
375 public string llXorBase64StringsCorrect(string str1, string str2) { return ""; } 386 public string llXorBase64StringsCorrect(string str1, string str2) { return ""; }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_Interface.cs
index b7eba61..4bc8b77 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_Interface.cs
@@ -472,7 +472,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
472 //wiki: llCloseRemoteDataChannel(key channel) 472 //wiki: llCloseRemoteDataChannel(key channel)
473 void llCloseRemoteDataChannel(string channel); 473 void llCloseRemoteDataChannel(string channel);
474 //wiki: string llMD5String(string src, integer nonce) 474 //wiki: string llMD5String(string src, integer nonce)
475 void llMD5String(string src, Int32 nonce); 475 string llMD5String(string src, Int32 nonce);
476 void llSetPrimitiveParams(); 476 void llSetPrimitiveParams();
477 //wiki: string llStringToBase64(string str) 477 //wiki: string llStringToBase64(string str)
478 string llStringToBase64(string str); 478 string llStringToBase64(string str);