diff options
author | Charles Krinke | 2008-09-29 20:24:59 +0000 |
---|---|---|
committer | Charles Krinke | 2008-09-29 20:24:59 +0000 |
commit | 307f26e80e7d14a49fe0cf766849fb9bd81b1c5f (patch) | |
tree | ff6175bd0cb0c1117d8e8ef1c7d585de373ff3f7 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | * minor: forgot this small tidy in the last checkin (diff) | |
download | opensim-SC_OLD-307f26e80e7d14a49fe0cf766849fb9bd81b1c5f.zip opensim-SC_OLD-307f26e80e7d14a49fe0cf766849fb9bd81b1c5f.tar.gz opensim-SC_OLD-307f26e80e7d14a49fe0cf766849fb9bd81b1c5f.tar.bz2 opensim-SC_OLD-307f26e80e7d14a49fe0cf766849fb9bd81b1c5f.tar.xz |
Mantis#2299. Thank you kindly, Idb for a patch that:
OS/SL script conformance, implement llSoundPreload and
llRemoteLoadScript to behave as in SL. In SL
llSoundPreload appears to do nothing. In OS
llRemoteLoadScript shouts an error when invoked
"Deprecated. Please use llRemoteLoadScriptPin instead."
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 540ff98..7c19ad7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -134,6 +134,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
134 | m_ScriptEngine.SetState(m_itemID, newState); | 134 | m_ScriptEngine.SetState(m_itemID, newState); |
135 | } | 135 | } |
136 | 136 | ||
137 | /// <summary> | ||
138 | /// Reset the named script. The script must be present | ||
139 | /// in the same prim. | ||
140 | /// </summary> | ||
137 | public void llResetScript() | 141 | public void llResetScript() |
138 | { | 142 | { |
139 | m_host.AddScriptLPS(1); | 143 | m_host.AddScriptLPS(1); |
@@ -2616,10 +2620,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2616 | NotImplemented("llMinEventDelay"); | 2620 | NotImplemented("llMinEventDelay"); |
2617 | } | 2621 | } |
2618 | 2622 | ||
2619 | public void llSoundPreload() | 2623 | /// <summary> |
2624 | /// llSoundPreload is deprecated. In SL this appears to do absolutely nothing | ||
2625 | /// and is documented to have no delay. | ||
2626 | /// </summary> | ||
2627 | public void llSoundPreload(string sound) | ||
2620 | { | 2628 | { |
2621 | m_host.AddScriptLPS(1); | 2629 | m_host.AddScriptLPS(1); |
2622 | Deprecated("llSoundPreload"); | ||
2623 | } | 2630 | } |
2624 | 2631 | ||
2625 | public void llRotLookAt(LSL_Rotation target, double strength, double damping) | 2632 | public void llRotLookAt(LSL_Rotation target, double strength, double damping) |
@@ -5356,14 +5363,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5356 | } | 5363 | } |
5357 | 5364 | ||
5358 | /// <summary> | 5365 | /// <summary> |
5359 | /// Reset the named script. The script must be present | 5366 | /// This is a depecated function so this just replicates the result of |
5360 | /// in the same prim. | 5367 | /// invoking it in SL |
5361 | /// </summary> | 5368 | /// </summary> |
5362 | 5369 | ||
5363 | public void llRemoteLoadScript() | 5370 | public void llRemoteLoadScript(string target, string name, int running, int start_param) |
5364 | { | 5371 | { |
5365 | m_host.AddScriptLPS(1); | 5372 | m_host.AddScriptLPS(1); |
5366 | Deprecated("llRemoteLoadScript"); | 5373 | // Report an error as it does in SL |
5374 | ShoutError("Deprecated. Please use llRemoteLoadScriptPin instead."); | ||
5367 | // ScriptSleep(3000); | 5375 | // ScriptSleep(3000); |
5368 | } | 5376 | } |
5369 | 5377 | ||