3 files changed, 45 insertions, 30 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 880ca1b..fe71ed5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -54,13 +54,13 @@ using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
 namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
     [Serializable]
-    public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi
+    public class LS_Api : MarshalByRefObject, ILS_Api, IScriptApi
     {
         internal IScriptEngine m_ScriptEngine;
         internal SceneObjectPart m_host;
         internal uint m_localID;
         internal UUID m_itemID;
-        internal bool m_CMFunctionsEnabled = false;
+        internal bool m_LSFunctionsEnabled = false;
         internal IScriptModuleComms m_comms = null;
 
         public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
@@ -70,12 +70,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_localID = localID;
             m_itemID = itemID;
 
-            if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
-                m_CMFunctionsEnabled = true;
+            if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
+                m_LSFunctionsEnabled = true;
 
             m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
             if (m_comms == null)
-                m_CMFunctionsEnabled = false;
+                m_LSFunctionsEnabled = false;
         }
 
         public override Object InitializeLifetimeService()
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         //Dumps an error message on the debug console.
         //
 
-        internal void CMShoutError(string message)
+        internal void LSShoutError(string message)
         {
             if (message.Length > 1023)
                 message = message.Substring(0, 1023);
@@ -116,11 +116,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Get the current Windlight scene
         /// </summary>
         /// <returns>List of windlight parameters</returns>
-        public LSL_List cmGetWindlightScene(LSL_List rules)
+        public LSL_List lsGetWindlightScene(LSL_List rules)
         {
-            if (!m_CMFunctionsEnabled)
+            if (!m_LSFunctionsEnabled)
             {
-                CMShoutError("Careminster functions are not enabled.");
+                LSShoutError("LightShare functions are not enabled.");
                 return new LSL_List();
             }
             m_host.AddScriptLPS(1);
@@ -440,16 +440,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         /// <param name="rules"></param>
         /// <returns>success: true or false</returns>
-        public int cmSetWindlightScene(LSL_List rules)
+        public int lsSetWindlightScene(LSL_List rules)
         {
-            if (!m_CMFunctionsEnabled)
+            if (!m_LSFunctionsEnabled)
             {
-                CMShoutError("Careminster functions are not enabled.");
+                LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
             if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
-                CMShoutError("cmSetWindlightScene can only be used by estate managers or owners.");
+                LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return 0;
             }
             int success = 0;
@@ -462,7 +462,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                CMShoutError("Windlight module is disabled");
+                LSShoutError("Windlight module is disabled");
                 return 0;
             }
             return success;
@@ -472,16 +472,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         /// <param name="rules"></param>
         /// <returns>success: true or false</returns>
-        public int cmSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)
+        public int lsSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)
         {
-            if (!m_CMFunctionsEnabled)
+            if (!m_LSFunctionsEnabled)
             {
-                CMShoutError("Careminster functions are not enabled.");
+                LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
             if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
-                CMShoutError("cmSetWindlightSceneTargeted can only be used by estate managers or owners.");
+                LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
                 return 0;
             }
             int success = 0;
@@ -494,7 +494,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                CMShoutError("Windlight module is disabled");
+                LSShoutError("Windlight module is disabled");
                 return 0;
             }
             return success;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs
index f13b6e5..9aa437b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs
@@ -38,11 +38,11 @@ using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 {
-    public interface ICM_Api
+    public interface ILS_Api
     {
         // Windlight Functions
-        LSL_List cmGetWindlightScene(LSL_List rules);
-        int cmSetWindlightScene(LSL_List rules);
-        int cmSetWindlightSceneTargeted(LSL_List rules, key target);
+        LSL_List lsGetWindlightScene(LSL_List rules);
+        int lsSetWindlightScene(LSL_List rules);
+        int lsSetWindlightSceneTargeted(LSL_List rules, key target);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index c0edaae..8280ca5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -48,29 +48,44 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
 {
     public partial class ScriptBaseClass : MarshalByRefObject
     {
-        public ICM_Api m_CM_Functions;
+        public ILS_Api m_LS_Functions;
 
-        public void ApiTypeCM(IScriptApi api)
+        public void ApiTypeLS(IScriptApi api)
         {
-            if (!(api is ICM_Api))
+            if (!(api is ILS_Api))
                 return;
 
-            m_CM_Functions = (ICM_Api)api;
+            m_LS_Functions = (ILS_Api)api;
+        }
+
+        public LSL_List lsGetWindlightScene(LSL_List rules)
+        {
+            return m_LS_Functions.lsGetWindlightScene(rules);
+        }
+
+        public int lsSetWindlightScene(LSL_List rules)
+        {
+            return m_LS_Functions.lsSetWindlightScene(rules);
+        }
+
+        public int lsSetWindlightSceneTargeted(LSL_List rules, key target)
+        {
+            return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
         }
 
         public LSL_List cmGetWindlightScene(LSL_List rules)
         {
-            return m_CM_Functions.cmGetWindlightScene(rules);
+            return m_LS_Functions.lsGetWindlightScene(rules);
         }
 
         public int cmSetWindlightScene(LSL_List rules)
         {
-            return m_CM_Functions.cmSetWindlightScene(rules);
+            return m_LS_Functions.lsSetWindlightScene(rules);
         }
 
         public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
         {
-            return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target);
+            return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
         }
     }
 }