OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename CM files to LS

avinationmerge
Melanie Thielker 2010-06-11 17:42:16 +02:00
parent 97d83c87ec
commit 10ef80cf15
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs → OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
View File

@ -54,13 +54,13 @@ using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
namespace OpenSim.Region.ScriptEngine.Shared.Api namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
[Serializable] [Serializable]
public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi public class LS_Api : MarshalByRefObject, ILS_Api, IScriptApi
{ {
internal IScriptEngine m_ScriptEngine; internal IScriptEngine m_ScriptEngine;
internal SceneObjectPart m_host; internal SceneObjectPart m_host;
internal uint m_localID; internal uint m_localID;
internal UUID m_itemID; internal UUID m_itemID;
internal bool m_CMFunctionsEnabled = false; internal bool m_LSFunctionsEnabled = false;
internal IScriptModuleComms m_comms = null; internal IScriptModuleComms m_comms = null;
public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
@ -71,11 +71,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_itemID = itemID; m_itemID = itemID;
if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false)) if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
m_CMFunctionsEnabled = true; m_LSFunctionsEnabled = true;
m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>(); m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
if (m_comms == null) if (m_comms == null)
m_CMFunctionsEnabled = false; m_LSFunctionsEnabled = false;
} }
public override Object InitializeLifetimeService() public override Object InitializeLifetimeService()
@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
//Dumps an error message on the debug console. //Dumps an error message on the debug console.
// //
internal void CMShoutError(string message) internal void LSShoutError(string message)
{ {
if (message.Length > 1023) if (message.Length > 1023)
message = message.Substring(0, 1023); message = message.Substring(0, 1023);
@ -118,9 +118,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// <returns>List of windlight parameters</returns> /// <returns>List of windlight parameters</returns>
public LSL_List lsGetWindlightScene(LSL_List rules) public LSL_List lsGetWindlightScene(LSL_List rules)
{ {
if (!m_CMFunctionsEnabled) if (!m_LSFunctionsEnabled)
{ {
CMShoutError("LightShare functions are not enabled."); LSShoutError("LightShare functions are not enabled.");
return new LSL_List(); return new LSL_List();
} }
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
@ -442,14 +442,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// <returns>success: true or false</returns> /// <returns>success: true or false</returns>
public int lsSetWindlightScene(LSL_List rules) public int lsSetWindlightScene(LSL_List rules)
{ {
if (!m_CMFunctionsEnabled) if (!m_LSFunctionsEnabled)
{ {
CMShoutError("LightShare functions are not enabled."); LSShoutError("LightShare functions are not enabled.");
return 0; return 0;
} }
if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
{ {
CMShoutError("lsSetWindlightScene can only be used by estate managers or owners."); LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
return 0; return 0;
} }
int success = 0; int success = 0;
@ -462,7 +462,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
else else
{ {
CMShoutError("Windlight module is disabled"); LSShoutError("Windlight module is disabled");
return 0; return 0;
} }
return success; return success;
@ -474,14 +474,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// <returns>success: true or false</returns> /// <returns>success: true or false</returns>
public int lsSetWindlightSceneTargeted(LSL_List rules, LSL_Key target) public int lsSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)
{ {
if (!m_CMFunctionsEnabled) if (!m_LSFunctionsEnabled)
{ {
CMShoutError("LightShare functions are not enabled."); LSShoutError("LightShare functions are not enabled.");
return 0; return 0;
} }
if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
{ {
CMShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners."); LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
return 0; return 0;
} }
int success = 0; int success = 0;
@ -494,7 +494,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
else else
{ {
CMShoutError("Windlight module is disabled"); LSShoutError("Windlight module is disabled");
return 0; return 0;
} }
return success; return success;

2
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs → OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs
View File

@ -38,7 +38,7 @@ using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
{ {
public interface ICM_Api public interface ILS_Api
{ {
// Windlight Functions // Windlight Functions
LSL_List lsGetWindlightScene(LSL_List rules); LSL_List lsGetWindlightScene(LSL_List rules);

20
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs → OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
View File

@ -48,44 +48,44 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{ {
public partial class ScriptBaseClass : MarshalByRefObject 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; return;
m_CM_Functions = (ICM_Api)api; m_LS_Functions = (ILS_Api)api;
} }
public LSL_List lsGetWindlightScene(LSL_List rules) public LSL_List lsGetWindlightScene(LSL_List rules)
{ {
return m_CM_Functions.lsGetWindlightScene(rules); return m_LS_Functions.lsGetWindlightScene(rules);
} }
public int lsSetWindlightScene(LSL_List rules) public int lsSetWindlightScene(LSL_List rules)
{ {
return m_CM_Functions.lsSetWindlightScene(rules); return m_LS_Functions.lsSetWindlightScene(rules);
} }
public int lsSetWindlightSceneTargeted(LSL_List rules, key target) public int lsSetWindlightSceneTargeted(LSL_List rules, key target)
{ {
return m_CM_Functions.lsSetWindlightSceneTargeted(rules, target); return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
} }
public LSL_List cmGetWindlightScene(LSL_List rules) public LSL_List cmGetWindlightScene(LSL_List rules)
{ {
return m_CM_Functions.lsGetWindlightScene(rules); return m_LS_Functions.lsGetWindlightScene(rules);
} }
public int cmSetWindlightScene(LSL_List rules) public int cmSetWindlightScene(LSL_List rules)
{ {
return m_CM_Functions.lsSetWindlightScene(rules); return m_LS_Functions.lsSetWindlightScene(rules);
} }
public int cmSetWindlightSceneTargeted(LSL_List rules, key target) public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
{ {
return m_CM_Functions.lsSetWindlightSceneTargeted(rules, target); return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
} }
} }
} }