diff options
| author | Diva Canto | 2014-05-07 17:00:12 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-05-07 17:00:12 -0700 |
| commit | f4cba27105f68914de455cf6a27b9126e086cea1 (patch) | |
| tree | d87599f942f1e839dc4262f18c946564528314be /OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |
| parent | Allow Tools.Configger to take -inifile as argument (diff) | |
| parent | Add GridUserService service config to [UserAccountService] in Robust[.HG].ini... (diff) | |
| download | opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.zip opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.tar.gz opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.tar.bz2 opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 340edb3..18a1e84 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
| @@ -149,6 +149,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 149 | LSL_Vector llGetLocalPos(); | 149 | LSL_Vector llGetLocalPos(); |
| 150 | LSL_Rotation llGetLocalRot(); | 150 | LSL_Rotation llGetLocalRot(); |
| 151 | LSL_Float llGetMass(); | 151 | LSL_Float llGetMass(); |
| 152 | LSL_Float llGetMassMKS(); | ||
| 152 | LSL_Integer llGetMemoryLimit(); | 153 | LSL_Integer llGetMemoryLimit(); |
| 153 | void llGetNextEmail(string address, string subject); | 154 | void llGetNextEmail(string address, string subject); |
| 154 | LSL_String llGetNotecardLine(string name, int line); | 155 | LSL_String llGetNotecardLine(string name, int line); |