aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorMelanie2010-11-03 02:34:36 +0000
committerMelanie2010-11-03 02:34:36 +0000
commit5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8 (patch)
tree7d9deca98fbb3cf3f38a0938fcd28509bb783228 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentChange the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0 (diff)
parentAdd lsClearWindlightScene() to the lightshare module to remove WL settings (diff)
downloadopensim-SC-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.zip
opensim-SC-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.gz
opensim-SC-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.bz2
opensim-SC-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index 8280ca5..2e27f16 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -73,6 +73,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); 73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
74 } 74 }
75 75
76 public void lsClearWindlightScene()
77 {
78 m_LS_Functions.lsClearWindlightScene();
79 }
80
76 public LSL_List cmGetWindlightScene(LSL_List rules) 81 public LSL_List cmGetWindlightScene(LSL_List rules)
77 { 82 {
78 return m_LS_Functions.lsGetWindlightScene(rules); 83 return m_LS_Functions.lsGetWindlightScene(rules);
@@ -87,5 +92,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
87 { 92 {
88 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); 93 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
89 } 94 }
95
96 public void cmClearWindlightScene()
97 {
98 m_LS_Functions.lsClearWindlightScene();
99 }
90 } 100 }
91} 101}