aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
diff options
context:
space:
mode:
authorMelanie2009-12-31 23:30:41 +0000
committerMelanie2009-12-31 23:30:41 +0000
commit872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5 (patch)
treec17034093b35b661105b7de15f00e0522196f932 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
parentMerge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff)
parentReadds llCollisionFilter and adds llPassCollision. (diff)
downloadopensim-SC_OLD-872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5.zip
opensim-SC_OLD-872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5.tar.gz
opensim-SC_OLD-872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5.tar.bz2
opensim-SC_OLD-872387d278d5eaeb2bc118b76d5eb47a9c0dcaf5.tar.xz
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 580c354..ac9405e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -165,5 +165,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
165 LSL_List osGetRegionStats(); 165 LSL_List osGetRegionStats();
166 166
167 int osGetSimulatorMemory(); 167 int osGetSimulatorMemory();
168 void osKickAvatar(string FirstName,string SurName,string alert);
169 void osSetSpeed(string UUID, float SpeedModifier);
170 void osCauseHealing(string avatar, double healing);
171 void osCauseDamage(string avatar, double damage);
168 } 172 }
169} 173}