diff options
| author | Melanie | 2012-03-27 23:14:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-27 23:14:43 +0100 |
| commit | b18b1b1d700d4a5ffd306e5b69a08b241188c525 (patch) | |
| tree | 2bb99cd8095a9b562f9ee075274508da973dd2a2 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Reverse a conditional in XInventory that made updating system folder evrsion ... (diff) | |
| download | opensim-SC-b18b1b1d700d4a5ffd306e5b69a08b241188c525.zip opensim-SC-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.gz opensim-SC-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.bz2 opensim-SC-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 10 |
1 files changed, 10 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 09e5992..680cefb4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
| @@ -868,5 +868,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 868 | { | 868 | { |
| 869 | return m_OSSL_Functions.osGetInventoryDesc(item); | 869 | return m_OSSL_Functions.osGetInventoryDesc(item); |
| 870 | } | 870 | } |
| 871 | |||
| 872 | public LSL_Integer osInviteToGroup(LSL_Key agentId) | ||
| 873 | { | ||
| 874 | return m_OSSL_Functions.osInviteToGroup(agentId); | ||
| 875 | } | ||
| 876 | |||
| 877 | public LSL_Integer osEjectFromGroup(LSL_Key agentId) | ||
| 878 | { | ||
| 879 | return m_OSSL_Functions.osEjectFromGroup(agentId); | ||
| 880 | } | ||
| 871 | } | 881 | } |
| 872 | } | 882 | } |