diff options
author | Justin Clark-Casey (justincc) | 2012-01-25 21:26:34 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-25 21:26:34 +0000 |
commit | 2e7c1bcfd9b256c6041776f3a7aac1b62edc867b (patch) | |
tree | db09574e83ed6ae2cebc43150570da32d5c646a3 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates... (diff) | |
parent | llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParce... (diff) | |
download | opensim-SC_OLD-2e7c1bcfd9b256c6041776f3a7aac1b62edc867b.zip opensim-SC_OLD-2e7c1bcfd9b256c6041776f3a7aac1b62edc867b.tar.gz opensim-SC_OLD-2e7c1bcfd9b256c6041776f3a7aac1b62edc867b.tar.bz2 opensim-SC_OLD-2e7c1bcfd9b256c6041776f3a7aac1b62edc867b.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 5 |
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 508f33b..9733683 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -649,6 +649,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
649 | return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); | 649 | return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); |
650 | } | 650 | } |
651 | 651 | ||
652 | public LSL_String llGetParcelMusicURL() | ||
653 | { | ||
654 | return m_LSL_Functions.llGetParcelMusicURL(); | ||
655 | } | ||
656 | |||
652 | public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) | 657 | public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) |
653 | { | 658 | { |
654 | return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); | 659 | return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); |