diff options
author | Melanie | 2010-04-13 04:36:08 +0100 |
---|---|---|
committer | Melanie | 2010-04-13 04:36:08 +0100 |
commit | 9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f (patch) | |
tree | 0b57576deba41ef22c8fc0b29e6f2b92557fe3b0 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
download | opensim-SC_OLD-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.zip opensim-SC_OLD-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.gz opensim-SC_OLD-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.bz2 opensim-SC_OLD-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.xz |
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs index f13b6e5..fba27f9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs | |||
@@ -44,5 +44,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
44 | LSL_List cmGetWindlightScene(LSL_List rules); | 44 | LSL_List cmGetWindlightScene(LSL_List rules); |
45 | int cmSetWindlightScene(LSL_List rules); | 45 | int cmSetWindlightScene(LSL_List rules); |
46 | int cmSetWindlightSceneTargeted(LSL_List rules, key target); | 46 | int cmSetWindlightSceneTargeted(LSL_List rules, key target); |
47 | LSL_List cmGetAvatarList(); | ||
47 | } | 48 | } |
48 | } | 49 | } |