aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface
diff options
context:
space:
mode:
authorMelanie2012-04-13 03:03:44 +0100
committerMelanie2012-04-13 03:03:44 +0100
commit5e3a76361fa097a2c47f6d37884786ec5777590c (patch)
tree85d791855e6e3646194a572fae5f2fb3d7a84110 /OpenSim/Region/ScriptEngine/Shared/Api/Interface
parentMerge branch 'master' into careminster (diff)
parentmake llGetGeometricCenter() work as in current SL. Now this is not real geom ... (diff)
downloadopensim-SC_OLD-5e3a76361fa097a2c47f6d37884786ec5777590c.zip
opensim-SC_OLD-5e3a76361fa097a2c47f6d37884786ec5777590c.tar.gz
opensim-SC_OLD-5e3a76361fa097a2c47f6d37884786ec5777590c.tar.bz2
opensim-SC_OLD-5e3a76361fa097a2c47f6d37884786ec5777590c.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index b976dc3..5c528977 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -148,7 +148,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
148 LSL_Vector llGetLocalPos(); 148 LSL_Vector llGetLocalPos();
149 LSL_Rotation llGetLocalRot(); 149 LSL_Rotation llGetLocalRot();
150 LSL_Float llGetMass(); 150 LSL_Float llGetMass();
151 void llGetNextEmail(string address, string subject); 151 LSL_Float llGetMassMKS();
152 void llGetNextEmail(string address, string subject);
152 LSL_String llGetNotecardLine(string name, int line); 153 LSL_String llGetNotecardLine(string name, int line);
153 LSL_Key llGetNumberOfNotecardLines(string name); 154 LSL_Key llGetNumberOfNotecardLines(string name);
154 LSL_Integer llGetNumberOfPrims(); 155 LSL_Integer llGetNumberOfPrims();