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

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."
0.6.0-stable
Charles Krinke 2008-09-29 20:24:59 +00:00
parent 5e238be255
commit 307f26e80e
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -134,6 +134,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_ScriptEngine.SetState(m_itemID, newState); m_ScriptEngine.SetState(m_itemID, newState);
} }
/// <summary>
/// Reset the named script. The script must be present
/// in the same prim.
/// </summary>
public void llResetScript() public void llResetScript()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
@ -2616,10 +2620,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
NotImplemented("llMinEventDelay"); NotImplemented("llMinEventDelay");
} }
public void llSoundPreload() /// <summary>
/// llSoundPreload is deprecated. In SL this appears to do absolutely nothing
/// and is documented to have no delay.
/// </summary>
public void llSoundPreload(string sound)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llSoundPreload");
} }
public void llRotLookAt(LSL_Rotation target, double strength, double damping) public void llRotLookAt(LSL_Rotation target, double strength, double damping)
@ -5356,14 +5363,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
/// <summary> /// <summary>
/// Reset the named script. The script must be present /// This is a depecated function so this just replicates the result of
/// in the same prim. /// invoking it in SL
/// </summary> /// </summary>
public void llRemoteLoadScript() public void llRemoteLoadScript(string target, string name, int running, int start_param)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llRemoteLoadScript"); // Report an error as it does in SL
ShoutError("Deprecated. Please use llRemoteLoadScriptPin instead.");
// ScriptSleep(3000); // ScriptSleep(3000);
} }

4
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@ -262,7 +262,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void llReleaseControls(); void llReleaseControls();
void llRemoteDataReply(string channel, string message_id, string sdata, int idata); void llRemoteDataReply(string channel, string message_id, string sdata, int idata);
void llRemoteDataSetRegion(); void llRemoteDataSetRegion();
void llRemoteLoadScript(); void llRemoteLoadScript(string target, string name, int running, int start_param);
void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param); void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param);
void llRemoveFromLandBanList(string avatar); void llRemoveFromLandBanList(string avatar);
void llRemoveFromLandPassList(string avatar); void llRemoveFromLandPassList(string avatar);
@ -348,7 +348,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void llSitTarget(LSL_Vector offset, LSL_Rotation rot); void llSitTarget(LSL_Vector offset, LSL_Rotation rot);
void llSleep(double sec); void llSleep(double sec);
void llSound(); void llSound();
void llSoundPreload(); void llSoundPreload(string sound);
LSL_Float llSqrt(double f); LSL_Float llSqrt(double f);
void llStartAnimation(string anim); void llStartAnimation(string anim);
void llStopAnimation(string anim); void llStopAnimation(string anim);

8
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@ -1169,9 +1169,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_LSL_Functions.llRemoteDataSetRegion(); m_LSL_Functions.llRemoteDataSetRegion();
} }
public void llRemoteLoadScript() public void llRemoteLoadScript(string target, string name, int running, int start_param)
{ {
m_LSL_Functions.llRemoteLoadScript(); m_LSL_Functions.llRemoteLoadScript(target, name, running, start_param);
} }
public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param) public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param)
@ -1599,9 +1599,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_LSL_Functions.llSound(); m_LSL_Functions.llSound();
} }
public void llSoundPreload() public void llSoundPreload(string sound)
{ {
m_LSL_Functions.llSoundPreload(); m_LSL_Functions.llSoundPreload(sound);
} }
public LSL_Float llSqrt(double f) public LSL_Float llSqrt(double f)