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

Rename cm* function set to ls* (for LightShare)

avinationmerge
Melanie Thielker 2010-06-11 17:23:06 +02:00
parent 8d5cec5e0d
commit 97d83c87ec
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
View File

@ -70,7 +70,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_localID = localID; m_localID = localID;
m_itemID = itemID; m_itemID = itemID;
if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false)) if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
m_CMFunctionsEnabled = true; m_CMFunctionsEnabled = true;
m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>(); m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
@ -116,11 +116,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// Get the current Windlight scene /// Get the current Windlight scene
/// </summary> /// </summary>
/// <returns>List of windlight parameters</returns> /// <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_CMFunctionsEnabled)
{ {
CMShoutError("Careminster functions are not enabled."); CMShoutError("LightShare functions are not enabled.");
return new LSL_List(); return new LSL_List();
} }
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
@ -440,16 +440,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// </summary> /// </summary>
/// <param name="rules"></param> /// <param name="rules"></param>
/// <returns>success: true or false</returns> /// <returns>success: true or false</returns>
public int cmSetWindlightScene(LSL_List rules) public int lsSetWindlightScene(LSL_List rules)
{ {
if (!m_CMFunctionsEnabled) if (!m_CMFunctionsEnabled)
{ {
CMShoutError("Careminster functions are not enabled."); CMShoutError("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("cmSetWindlightScene can only be used by estate managers or owners."); CMShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
return 0; return 0;
} }
int success = 0; int success = 0;
@ -472,16 +472,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// </summary> /// </summary>
/// <param name="rules"></param> /// <param name="rules"></param>
/// <returns>success: true or false</returns> /// <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_CMFunctionsEnabled)
{ {
CMShoutError("Careminster functions are not enabled."); CMShoutError("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("cmSetWindlightSceneTargeted can only be used by estate managers or owners."); CMShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
return 0; return 0;
} }
int success = 0; int success = 0;

6
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
View File

@ -41,8 +41,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
public interface ICM_Api public interface ICM_Api
{ {
// Windlight Functions // Windlight Functions
LSL_List cmGetWindlightScene(LSL_List rules); LSL_List lsGetWindlightScene(LSL_List rules);
int cmSetWindlightScene(LSL_List rules); int lsSetWindlightScene(LSL_List rules);
int cmSetWindlightSceneTargeted(LSL_List rules, key target); int lsSetWindlightSceneTargeted(LSL_List rules, key target);
} }
} }

21
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
View File

@ -58,19 +58,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_CM_Functions = (ICM_Api)api; m_CM_Functions = (ICM_Api)api;
} }
public LSL_List lsGetWindlightScene(LSL_List rules)
{
return m_CM_Functions.lsGetWindlightScene(rules);
}
public int lsSetWindlightScene(LSL_List rules)
{
return m_CM_Functions.lsSetWindlightScene(rules);
}
public int lsSetWindlightSceneTargeted(LSL_List rules, key target)
{
return m_CM_Functions.lsSetWindlightSceneTargeted(rules, target);
}
public LSL_List cmGetWindlightScene(LSL_List rules) public LSL_List cmGetWindlightScene(LSL_List rules)
{ {
return m_CM_Functions.cmGetWindlightScene(rules); return m_CM_Functions.lsGetWindlightScene(rules);
} }
public int cmSetWindlightScene(LSL_List rules) public int cmSetWindlightScene(LSL_List rules)
{ {
return m_CM_Functions.cmSetWindlightScene(rules); return m_CM_Functions.lsSetWindlightScene(rules);
} }
public int cmSetWindlightSceneTargeted(LSL_List rules, key target) public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
{ {
return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target); return m_CM_Functions.lsSetWindlightSceneTargeted(rules, target);
} }
} }
} }