diff options
author | Melanie | 2010-04-05 18:12:29 +0100 |
---|---|---|
committer | Melanie | 2010-04-05 18:12:29 +0100 |
commit | fe034dc3e41582a4e6fb54a9d28dbbf1413a9a9f (patch) | |
tree | c35a87bfa443bc53a4205d155481a11e53f4447e /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Updates to config files for groups (diff) | |
download | opensim-SC-fe034dc3e41582a4e6fb54a9d28dbbf1413a9a9f.zip opensim-SC-fe034dc3e41582a4e6fb54a9d28dbbf1413a9a9f.tar.gz opensim-SC-fe034dc3e41582a4e6fb54a9d28dbbf1413a9a9f.tar.bz2 opensim-SC-fe034dc3e41582a4e6fb54a9d28dbbf1413a9a9f.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs index 5bc3a88..c0edaae 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs | |||
@@ -66,11 +66,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
66 | public int cmSetWindlightScene(LSL_List rules) | 66 | public int cmSetWindlightScene(LSL_List rules) |
67 | { | 67 | { |
68 | return m_CM_Functions.cmSetWindlightScene(rules); | 68 | return m_CM_Functions.cmSetWindlightScene(rules); |
69 | } | 69 | } |
70 | 70 | ||
71 | public int cmSetWindlightSceneTargeted(LSL_List rules, key target) | 71 | public int cmSetWindlightSceneTargeted(LSL_List rules, key target) |
72 | { | 72 | { |
73 | return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target); | 73 | return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target); |
74 | } | 74 | } |
75 | } | 75 | } |
76 | } | 76 | } |