diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
3 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index d169912..1dcd1cc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3162,6 +3162,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3162 | } | 3162 | } |
3163 | } | 3163 | } |
3164 | 3164 | ||
3165 | public LSL_Float llGetMassMKS() | ||
3166 | { | ||
3167 | // this is what the wiki says it does! | ||
3168 | // http://wiki.secondlife.com/wiki/LlGetMassMKS | ||
3169 | return llGetMass() * 100.0; | ||
3170 | } | ||
3171 | |||
3165 | public void llCollisionFilter(string name, string id, int accept) | 3172 | public void llCollisionFilter(string name, string id, int accept) |
3166 | { | 3173 | { |
3167 | m_host.AddScriptLPS(1); | 3174 | m_host.AddScriptLPS(1); |
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); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 7cd17e7..49e39fe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -584,6 +584,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
584 | return m_LSL_Functions.llGetMass(); | 584 | return m_LSL_Functions.llGetMass(); |
585 | } | 585 | } |
586 | 586 | ||
587 | public LSL_Float llGetMassMKS() | ||
588 | { | ||
589 | return m_LSL_Functions.llGetMassMKS(); | ||
590 | } | ||
591 | |||
587 | public LSL_Integer llGetMemoryLimit() | 592 | public LSL_Integer llGetMemoryLimit() |
588 | { | 593 | { |
589 | return m_LSL_Functions.llGetMemoryLimit(); | 594 | return m_LSL_Functions.llGetMemoryLimit(); |