aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs8
3 files changed, 20 insertions, 12 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
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 96d99eb..812f2ff 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
262 void llReleaseControls(); 262 void llReleaseControls();
263 void llRemoteDataReply(string channel, string message_id, string sdata, int idata); 263 void llRemoteDataReply(string channel, string message_id, string sdata, int idata);
264 void llRemoteDataSetRegion(); 264 void llRemoteDataSetRegion();
265 void llRemoteLoadScript(); 265 void llRemoteLoadScript(string target, string name, int running, int start_param);
266 void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param); 266 void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param);
267 void llRemoveFromLandBanList(string avatar); 267 void llRemoveFromLandBanList(string avatar);
268 void llRemoveFromLandPassList(string avatar); 268 void llRemoveFromLandPassList(string avatar);
@@ -348,7 +348,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
348 void llSitTarget(LSL_Vector offset, LSL_Rotation rot); 348 void llSitTarget(LSL_Vector offset, LSL_Rotation rot);
349 void llSleep(double sec); 349 void llSleep(double sec);
350 void llSound(); 350 void llSound();
351 void llSoundPreload(); 351 void llSoundPreload(string sound);
352 LSL_Float llSqrt(double f); 352 LSL_Float llSqrt(double f);
353 void llStartAnimation(string anim); 353 void llStartAnimation(string anim);
354 void llStopAnimation(string anim); 354 void llStopAnimation(string anim);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 32cfff6..bebb011 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1169,9 +1169,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1169 m_LSL_Functions.llRemoteDataSetRegion(); 1169 m_LSL_Functions.llRemoteDataSetRegion();
1170 } 1170 }
1171 1171
1172 public void llRemoteLoadScript() 1172 public void llRemoteLoadScript(string target, string name, int running, int start_param)
1173 { 1173 {
1174 m_LSL_Functions.llRemoteLoadScript(); 1174 m_LSL_Functions.llRemoteLoadScript(target, name, running, start_param);
1175 } 1175 }
1176 1176
1177 public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param) 1177 public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param)
@@ -1599,9 +1599,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1599 m_LSL_Functions.llSound(); 1599 m_LSL_Functions.llSound();
1600 } 1600 }
1601 1601
1602 public void llSoundPreload() 1602 public void llSoundPreload(string sound)
1603 { 1603 {
1604 m_LSL_Functions.llSoundPreload(); 1604 m_LSL_Functions.llSoundPreload(sound);
1605 } 1605 }
1606 1606
1607 public LSL_Float llSqrt(double f) 1607 public LSL_Float llSqrt(double f)