diff options
author | Talun | 2012-04-14 00:37:55 +0100 |
---|---|---|
committer | nebadon | 2012-04-13 17:08:00 -0700 |
commit | 4d652c704186e9e399ffc6fc1bdf1f1dca056370 (patch) | |
tree | 9ec3bf715b1b4f70d9c430e52c545239480cf606 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | Add very basic TestGetRootPartPosition() test (diff) | |
download | opensim-SC_OLD-4d652c704186e9e399ffc6fc1bdf1f1dca056370.zip opensim-SC_OLD-4d652c704186e9e399ffc6fc1bdf1f1dca056370.tar.gz opensim-SC_OLD-4d652c704186e9e399ffc6fc1bdf1f1dca056370.tar.bz2 opensim-SC_OLD-4d652c704186e9e399ffc6fc1bdf1f1dca056370.tar.xz |
Missing or unimplemented LSL memory functions.
Implemented to behave as if scripts were LSO.
Signed-off-by: nebadon <michael@osgrid.org>
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 25 |
2 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index f58f9d6..fd7c41e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -381,6 +381,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
381 | public const int PRIM_SCULPT_FLAG_INVERT = 64; | 381 | public const int PRIM_SCULPT_FLAG_INVERT = 64; |
382 | public const int PRIM_SCULPT_FLAG_MIRROR = 128; | 382 | public const int PRIM_SCULPT_FLAG_MIRROR = 128; |
383 | 383 | ||
384 | public const int PROFILE_NONE = 0; | ||
385 | public const int PROFILE_SCRIPT_MEMORY = 1; | ||
386 | |||
384 | public const int MASK_BASE = 0; | 387 | public const int MASK_BASE = 0; |
385 | public const int MASK_OWNER = 1; | 388 | public const int MASK_OWNER = 1; |
386 | public const int MASK_GROUP = 2; | 389 | public const int MASK_GROUP = 2; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index f8e3c36..3c2f7bd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -569,6 +569,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
569 | return m_LSL_Functions.llGetMass(); | 569 | return m_LSL_Functions.llGetMass(); |
570 | } | 570 | } |
571 | 571 | ||
572 | public LSL_Integer llGetMemoryLimit() | ||
573 | { | ||
574 | return m_LSL_Functions.llGetMemoryLimit(); | ||
575 | } | ||
576 | |||
572 | public void llGetNextEmail(string address, string subject) | 577 | public void llGetNextEmail(string address, string subject) |
573 | { | 578 | { |
574 | m_LSL_Functions.llGetNextEmail(address, subject); | 579 | m_LSL_Functions.llGetNextEmail(address, subject); |
@@ -759,6 +764,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
759 | return m_LSL_Functions.llGetSimulatorHostname(); | 764 | return m_LSL_Functions.llGetSimulatorHostname(); |
760 | } | 765 | } |
761 | 766 | ||
767 | public LSL_Integer llGetSPMaxMemory() | ||
768 | { | ||
769 | return m_LSL_Functions.llGetSPMaxMemory(); | ||
770 | } | ||
771 | |||
762 | public LSL_Integer llGetStartParameter() | 772 | public LSL_Integer llGetStartParameter() |
763 | { | 773 | { |
764 | return m_LSL_Functions.llGetStartParameter(); | 774 | return m_LSL_Functions.llGetStartParameter(); |
@@ -824,6 +834,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
824 | return m_LSL_Functions.llGetUnixTime(); | 834 | return m_LSL_Functions.llGetUnixTime(); |
825 | } | 835 | } |
826 | 836 | ||
837 | public LSL_Integer llGetUsedMemory() | ||
838 | { | ||
839 | return m_LSL_Functions.llGetUsedMemory(); | ||
840 | } | ||
841 | |||
827 | public LSL_Vector llGetVel() | 842 | public LSL_Vector llGetVel() |
828 | { | 843 | { |
829 | return m_LSL_Functions.llGetVel(); | 844 | return m_LSL_Functions.llGetVel(); |
@@ -1423,6 +1438,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1423 | return m_LSL_Functions.llScriptDanger(pos); | 1438 | return m_LSL_Functions.llScriptDanger(pos); |
1424 | } | 1439 | } |
1425 | 1440 | ||
1441 | public void llScriptProfiler(LSL_Integer flags) | ||
1442 | { | ||
1443 | m_LSL_Functions.llScriptProfiler(flags); | ||
1444 | } | ||
1445 | |||
1426 | public LSL_Key llSendRemoteData(string channel, string dest, int idata, string sdata) | 1446 | public LSL_Key llSendRemoteData(string channel, string dest, int idata, string sdata) |
1427 | { | 1447 | { |
1428 | return m_LSL_Functions.llSendRemoteData(channel, dest, idata, sdata); | 1448 | return m_LSL_Functions.llSendRemoteData(channel, dest, idata, sdata); |
@@ -1533,6 +1553,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1533 | m_LSL_Functions.llSetLocalRot(rot); | 1553 | m_LSL_Functions.llSetLocalRot(rot); |
1534 | } | 1554 | } |
1535 | 1555 | ||
1556 | public LSL_Integer llSetMemoryLimit(LSL_Integer limit) | ||
1557 | { | ||
1558 | return m_LSL_Functions.llSetMemoryLimit(limit); | ||
1559 | } | ||
1560 | |||
1536 | public void llSetObjectDesc(string desc) | 1561 | public void llSetObjectDesc(string desc) |
1537 | { | 1562 | { |
1538 | m_LSL_Functions.llSetObjectDesc(desc); | 1563 | m_LSL_Functions.llSetObjectDesc(desc); |