diff options
author | Charles Krinke | 2008-09-30 01:59:51 +0000 |
---|---|---|
committer | Charles Krinke | 2008-09-30 01:59:51 +0000 |
commit | 68ae63e546479114fb6672624a6098da9ec7daa4 (patch) | |
tree | ced42aa80032949e5f18a4932a18123313c7573d /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | add a test for updating region settings and fix a bug in uuid (diff) | |
download | opensim-SC_OLD-68ae63e546479114fb6672624a6098da9ec7daa4.zip opensim-SC_OLD-68ae63e546479114fb6672624a6098da9ec7daa4.tar.gz opensim-SC_OLD-68ae63e546479114fb6672624a6098da9ec7daa4.tar.bz2 opensim-SC_OLD-68ae63e546479114fb6672624a6098da9ec7daa4.tar.xz |
Mantis#2300. Thank you kindly, Idb for a patch that solves:
A number of the deprecated functions had missing parameters
causing compile errors. These included:
llSound, llMakeExplosion, llMakeFountain, llMakeSmoke,
llMakeFire, llPointAt, llXorBase64Strings, llSetPrimURL
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7c19ad7..c2b16cf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1920,7 +1920,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1920 | return (double)((ScriptTime.TotalMilliseconds / 1000)*World.TimeDilation); | 1920 | return (double)((ScriptTime.TotalMilliseconds / 1000)*World.TimeDilation); |
1921 | } | 1921 | } |
1922 | 1922 | ||
1923 | public void llSound() | 1923 | public void llSound(string sound, double volume, int queue, int loop) |
1924 | { | 1924 | { |
1925 | m_host.AddScriptLPS(1); | 1925 | m_host.AddScriptLPS(1); |
1926 | // This function has been deprecated | 1926 | // This function has been deprecated |
@@ -2287,28 +2287,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2287 | return 0; | 2287 | return 0; |
2288 | } | 2288 | } |
2289 | 2289 | ||
2290 | public void llMakeExplosion() | 2290 | public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) |
2291 | { | 2291 | { |
2292 | m_host.AddScriptLPS(1); | 2292 | m_host.AddScriptLPS(1); |
2293 | Deprecated("llMakeExplosion"); | 2293 | Deprecated("llMakeExplosion"); |
2294 | // ScriptSleep(100); | 2294 | // ScriptSleep(100); |
2295 | } | 2295 | } |
2296 | 2296 | ||
2297 | public void llMakeFountain() | 2297 | public void llMakeFountain(int particles, float scale, float vel, float lifetime, float arc, int bounce, string texture, LSL_Vector offset, float bounce_offset) |
2298 | { | 2298 | { |
2299 | m_host.AddScriptLPS(1); | 2299 | m_host.AddScriptLPS(1); |
2300 | Deprecated("llMakeFountain"); | 2300 | Deprecated("llMakeFountain"); |
2301 | // ScriptSleep(100); | 2301 | // ScriptSleep(100); |
2302 | } | 2302 | } |
2303 | 2303 | ||
2304 | public void llMakeSmoke() | 2304 | public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) |
2305 | { | 2305 | { |
2306 | m_host.AddScriptLPS(1); | 2306 | m_host.AddScriptLPS(1); |
2307 | Deprecated("llMakeSmoke"); | 2307 | Deprecated("llMakeSmoke"); |
2308 | // ScriptSleep(100); | 2308 | // ScriptSleep(100); |
2309 | } | 2309 | } |
2310 | 2310 | ||
2311 | public void llMakeFire() | 2311 | public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) |
2312 | { | 2312 | { |
2313 | m_host.AddScriptLPS(1); | 2313 | m_host.AddScriptLPS(1); |
2314 | Deprecated("llMakeFire"); | 2314 | Deprecated("llMakeFire"); |
@@ -2707,7 +2707,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2707 | } | 2707 | } |
2708 | } | 2708 | } |
2709 | 2709 | ||
2710 | public void llPointAt() | 2710 | public void llPointAt(LSL_Vector pos) |
2711 | { | 2711 | { |
2712 | m_host.AddScriptLPS(1); | 2712 | m_host.AddScriptLPS(1); |
2713 | NotImplemented("llPointAt"); | 2713 | NotImplemented("llPointAt"); |
@@ -6148,11 +6148,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6148 | } | 6148 | } |
6149 | } | 6149 | } |
6150 | 6150 | ||
6151 | public void llXorBase64Strings() | 6151 | public LSL_String llXorBase64Strings(string str1, string str2) |
6152 | { | 6152 | { |
6153 | m_host.AddScriptLPS(1); | 6153 | m_host.AddScriptLPS(1); |
6154 | Deprecated("llXorBase64Strings"); | 6154 | Deprecated("llXorBase64Strings"); |
6155 | // ScriptSleep(300); | 6155 | // ScriptSleep(300); |
6156 | return String.Empty; | ||
6156 | } | 6157 | } |
6157 | 6158 | ||
6158 | public void llRemoteDataSetRegion() | 6159 | public void llRemoteDataSetRegion() |
@@ -7583,7 +7584,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7583 | return new LSL_Rotation(); | 7584 | return new LSL_Rotation(); |
7584 | } | 7585 | } |
7585 | 7586 | ||
7586 | public void llSetPrimURL() | 7587 | public void llSetPrimURL(string url) |
7587 | { | 7588 | { |
7588 | m_host.AddScriptLPS(1); | 7589 | m_host.AddScriptLPS(1); |
7589 | NotImplemented("llSetPrimURL"); | 7590 | NotImplemented("llSetPrimURL"); |