diff options
author | Melanie Thielker | 2010-06-11 17:23:06 +0200 |
---|---|---|
committer | Melanie | 2010-06-11 17:30:23 +0100 |
commit | ad87bab27192a54249eecde0260ccda565d87e5c (patch) | |
tree | df3453a8b41f3982510f5854be370b39f6e042cb /OpenSim/Region/ScriptEngine/Shared | |
parent | Clone cmGetAvatarList into osGetAvatarList for more generic use. (diff) | |
download | opensim-SC_OLD-ad87bab27192a54249eecde0260ccda565d87e5c.zip opensim-SC_OLD-ad87bab27192a54249eecde0260ccda565d87e5c.tar.gz opensim-SC_OLD-ad87bab27192a54249eecde0260ccda565d87e5c.tar.bz2 opensim-SC_OLD-ad87bab27192a54249eecde0260ccda565d87e5c.tar.xz |
Rename cm* function set to ls* (for LightShare)
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
3 files changed, 30 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs index 880ca1b..9a99f5e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
70 | m_localID = localID; | 70 | m_localID = localID; |
71 | m_itemID = itemID; | 71 | m_itemID = itemID; |
72 | 72 | ||
73 | if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false)) | 73 | if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false)) |
74 | m_CMFunctionsEnabled = true; | 74 | m_CMFunctionsEnabled = true; |
75 | 75 | ||
76 | m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>(); | 76 | m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>(); |
@@ -116,11 +116,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
116 | /// Get the current Windlight scene | 116 | /// Get the current Windlight scene |
117 | /// </summary> | 117 | /// </summary> |
118 | /// <returns>List of windlight parameters</returns> | 118 | /// <returns>List of windlight parameters</returns> |
119 | public LSL_List cmGetWindlightScene(LSL_List rules) | 119 | public LSL_List lsGetWindlightScene(LSL_List rules) |
120 | { | 120 | { |
121 | if (!m_CMFunctionsEnabled) | 121 | if (!m_CMFunctionsEnabled) |
122 | { | 122 | { |
123 | CMShoutError("Careminster functions are not enabled."); | 123 | CMShoutError("LightShare functions are not enabled."); |
124 | return new LSL_List(); | 124 | return new LSL_List(); |
125 | } | 125 | } |
126 | m_host.AddScriptLPS(1); | 126 | m_host.AddScriptLPS(1); |
@@ -440,16 +440,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
440 | /// </summary> | 440 | /// </summary> |
441 | /// <param name="rules"></param> | 441 | /// <param name="rules"></param> |
442 | /// <returns>success: true or false</returns> | 442 | /// <returns>success: true or false</returns> |
443 | public int cmSetWindlightScene(LSL_List rules) | 443 | public int lsSetWindlightScene(LSL_List rules) |
444 | { | 444 | { |
445 | if (!m_CMFunctionsEnabled) | 445 | if (!m_CMFunctionsEnabled) |
446 | { | 446 | { |
447 | CMShoutError("Careminster functions are not enabled."); | 447 | CMShoutError("LightShare functions are not enabled."); |
448 | return 0; | 448 | return 0; |
449 | } | 449 | } |
450 | if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) | 450 | if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) |
451 | { | 451 | { |
452 | CMShoutError("cmSetWindlightScene can only be used by estate managers or owners."); | 452 | CMShoutError("lsSetWindlightScene can only be used by estate managers or owners."); |
453 | return 0; | 453 | return 0; |
454 | } | 454 | } |
455 | int success = 0; | 455 | int success = 0; |
@@ -472,16 +472,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
472 | /// </summary> | 472 | /// </summary> |
473 | /// <param name="rules"></param> | 473 | /// <param name="rules"></param> |
474 | /// <returns>success: true or false</returns> | 474 | /// <returns>success: true or false</returns> |
475 | public int cmSetWindlightSceneTargeted(LSL_List rules, LSL_Key target) | 475 | public int lsSetWindlightSceneTargeted(LSL_List rules, LSL_Key target) |
476 | { | 476 | { |
477 | if (!m_CMFunctionsEnabled) | 477 | if (!m_CMFunctionsEnabled) |
478 | { | 478 | { |
479 | CMShoutError("Careminster functions are not enabled."); | 479 | CMShoutError("LightShare functions are not enabled."); |
480 | return 0; | 480 | return 0; |
481 | } | 481 | } |
482 | if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) | 482 | if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) |
483 | { | 483 | { |
484 | CMShoutError("cmSetWindlightSceneTargeted can only be used by estate managers or owners."); | 484 | CMShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners."); |
485 | return 0; | 485 | return 0; |
486 | } | 486 | } |
487 | int success = 0; | 487 | int success = 0; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs index f13b6e5..f47ae7d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs | |||
@@ -41,8 +41,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
41 | public interface ICM_Api | 41 | public interface ICM_Api |
42 | { | 42 | { |
43 | // Windlight Functions | 43 | // Windlight Functions |
44 | LSL_List cmGetWindlightScene(LSL_List rules); | 44 | LSL_List lsGetWindlightScene(LSL_List rules); |
45 | int cmSetWindlightScene(LSL_List rules); | 45 | int lsSetWindlightScene(LSL_List rules); |
46 | int cmSetWindlightSceneTargeted(LSL_List rules, key target); | 46 | int lsSetWindlightSceneTargeted(LSL_List rules, key target); |
47 | } | 47 | } |
48 | } | 48 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs index c0edaae..92c3d98 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs | |||
@@ -58,19 +58,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
58 | m_CM_Functions = (ICM_Api)api; | 58 | m_CM_Functions = (ICM_Api)api; |
59 | } | 59 | } |
60 | 60 | ||
61 | public LSL_List lsGetWindlightScene(LSL_List rules) | ||
62 | { | ||
63 | return m_CM_Functions.lsGetWindlightScene(rules); | ||
64 | } | ||
65 | |||
66 | public int lsSetWindlightScene(LSL_List rules) | ||
67 | { | ||
68 | return m_CM_Functions.lsSetWindlightScene(rules); | ||
69 | } | ||
70 | |||
71 | public int lsSetWindlightSceneTargeted(LSL_List rules, key target) | ||
72 | { | ||
73 | return m_CM_Functions.lsSetWindlightSceneTargeted(rules, target); | ||
74 | } | ||
75 | |||
61 | public LSL_List cmGetWindlightScene(LSL_List rules) | 76 | public LSL_List cmGetWindlightScene(LSL_List rules) |
62 | { | 77 | { |
63 | return m_CM_Functions.cmGetWindlightScene(rules); | 78 | return m_CM_Functions.lsGetWindlightScene(rules); |
64 | } | 79 | } |
65 | 80 | ||
66 | public int cmSetWindlightScene(LSL_List rules) | 81 | public int cmSetWindlightScene(LSL_List rules) |
67 | { | 82 | { |
68 | return m_CM_Functions.cmSetWindlightScene(rules); | 83 | return m_CM_Functions.lsSetWindlightScene(rules); |
69 | } | 84 | } |
70 | 85 | ||
71 | public int cmSetWindlightSceneTargeted(LSL_List rules, key target) | 86 | public int cmSetWindlightSceneTargeted(LSL_List rules, key target) |
72 | { | 87 | { |
73 | return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target); | 88 | return m_CM_Functions.lsSetWindlightSceneTargeted(rules, target); |
74 | } | 89 | } |
75 | } | 90 | } |
76 | } | 91 | } |