aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorPixelTomsen2012-02-24 20:46:14 +0100
committerJustin Clark-Casey (justincc)2012-02-24 23:10:41 +0000
commit7b5e42c744ceeee739f1fbdb2c96552dfd4add52 (patch)
tree180fc1b17baac58ebf25f25a7401f3fdf3d55d61 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentTake watchdog alarm calling back outside the m_threads lock. (diff)
downloadopensim-SC_OLD-7b5e42c744ceeee739f1fbdb2c96552dfd4add52.zip
opensim-SC_OLD-7b5e42c744ceeee739f1fbdb2c96552dfd4add52.tar.gz
opensim-SC_OLD-7b5e42c744ceeee739f1fbdb2c96552dfd4add52.tar.bz2
opensim-SC_OLD-7b5e42c744ceeee739f1fbdb2c96552dfd4add52.tar.xz
llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs19
1 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 24c3d95..f8e3c36 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1887,17 +1887,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1887 { 1887 {
1888 return m_LSL_Functions.llGetPrimMediaParams(face, rules); 1888 return m_LSL_Functions.llGetPrimMediaParams(face, rules);
1889 } 1889 }
1890 1890
1891 public LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
1892 {
1893 return m_LSL_Functions.llGetLinkMedia(link, face, rules);
1894 }
1895
1891 public LSL_Integer llSetPrimMediaParams(int face, LSL_List rules) 1896 public LSL_Integer llSetPrimMediaParams(int face, LSL_List rules)
1892 { 1897 {
1893 return m_LSL_Functions.llSetPrimMediaParams(face, rules); 1898 return m_LSL_Functions.llSetPrimMediaParams(face, rules);
1894 } 1899 }
1895 1900
1901 public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
1902 {
1903 return m_LSL_Functions.llSetLinkMedia(link, face, rules);
1904 }
1905
1896 public LSL_Integer llClearPrimMedia(LSL_Integer face) 1906 public LSL_Integer llClearPrimMedia(LSL_Integer face)
1897 { 1907 {
1898 return m_LSL_Functions.llClearPrimMedia(face); 1908 return m_LSL_Functions.llClearPrimMedia(face);
1899 } 1909 }
1900 1910
1911 public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face)
1912 {
1913 return m_LSL_Functions.llClearLinkMedia(link, face);
1914 }
1915
1901 public void print(string str) 1916 public void print(string str)
1902 { 1917 {
1903 m_LSL_Functions.print(str); 1918 m_LSL_Functions.print(str);