aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorMelanie2009-12-31 04:53:05 +0000
committerMelanie2009-12-31 04:53:05 +0000
commit643cc7a0ee19dd6670d674eca5ed039c652f14bf (patch)
tree4ae205fa5e0aad244c7a41b47cf7e3cf147bdb8a /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parent[PATCH] Adds llCollisionFilter (diff)
downloadopensim-SC_OLD-643cc7a0ee19dd6670d674eca5ed039c652f14bf.zip
opensim-SC_OLD-643cc7a0ee19dd6670d674eca5ed039c652f14bf.tar.gz
opensim-SC_OLD-643cc7a0ee19dd6670d674eca5ed039c652f14bf.tar.bz2
opensim-SC_OLD-643cc7a0ee19dd6670d674eca5ed039c652f14bf.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs16
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 2876ad6..2ec6226 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -647,5 +647,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
647 { 647 {
648 return m_OSSL_Functions.osGetSimulatorMemory(); 648 return m_OSSL_Functions.osGetSimulatorMemory();
649 } 649 }
650 public void osKickAvatar(string FirstName,string SurName,string alert)
651 {
652 m_OSSL_Functions.osKickAvatar( FirstName, SurName, alert);
653 }
654 public void osSetSpeed(string UUID, float SpeedModifier)
655 {
656 m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier);
657 }
658 public void osCauseDamage(string avatar, double damage)
659 {
660 m_OSSL_Functions.osCauseDamage(avatar, damage);
661 }
662 public void osCauseHealing(string avatar, double healing)
663 {
664 m_OSSL_Functions.osCauseHealing(avatar, healing);
665 }
650 } 666 }
651} 667}