Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

2 files changed, 1 insertions, 16 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index 8280ca5..f8dbe03 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -72,20 +72,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
         }
-
-        public LSL_List cmGetWindlightScene(LSL_List rules)
-        {
-            return m_LS_Functions.lsGetWindlightScene(rules);
-        }
-
-        public int cmSetWindlightScene(LSL_List rules)
-        {
-            return m_LS_Functions.lsSetWindlightScene(rules);
-        }
-
-        public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
-        {
-            return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
-        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
index 23138ef..f02d2d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
@@ -18,10 +18,10 @@
   </DeploymentInformation>
   <Contents>
     <File name="./CM_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name="./CM_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name="./Executor.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name="./LSL_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name="./LSL_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./LS_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name="./MOD_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name="./OSSL_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name="./ScriptBase.cs" subtype="Code" buildaction="Compile" dependson="" data="" />