aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
diff options
context:
space:
mode:
authorDiva Canto2014-05-07 17:00:12 -0700
committerDiva Canto2014-05-07 17:00:12 -0700
commitf4cba27105f68914de455cf6a27b9126e086cea1 (patch)
treed87599f942f1e839dc4262f18c946564528314be /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
parentAllow Tools.Configger to take -inifile as argument (diff)
parentAdd GridUserService service config to [UserAccountService] in Robust[.HG].ini... (diff)
downloadopensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.zip
opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.tar.gz
opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.tar.bz2
opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs5
1 files changed, 5 insertions, 0 deletions
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();