aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorCharles Krinke2008-09-30 01:59:51 +0000
committerCharles Krinke2008-09-30 01:59:51 +0000
commit68ae63e546479114fb6672624a6098da9ec7daa4 (patch)
treeced42aa80032949e5f18a4932a18123313c7573d /OpenSim/Region/ScriptEngine/Shared
parentadd a test for updating region settings and fix a bug in uuid (diff)
downloadopensim-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 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs17
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs16
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs32
3 files changed, 33 insertions, 32 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");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 812f2ff..5670988 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -228,10 +228,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
228 void llLoopSound(string sound, double volume); 228 void llLoopSound(string sound, double volume);
229 void llLoopSoundMaster(string sound, double volume); 229 void llLoopSoundMaster(string sound, double volume);
230 void llLoopSoundSlave(string sound, double volume); 230 void llLoopSoundSlave(string sound, double volume);
231 void llMakeExplosion(); 231 void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset);
232 void llMakeFire(); 232 void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset);
233 void llMakeFountain(); 233 void llMakeFountain(int particles, float scale, float vel, float lifetime, float arc, int bounce, string texture, LSL_Vector offset, float bounce_offset);
234 void llMakeSmoke(); 234 void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset);
235 void llMapDestination(string simname, LSL_Vector pos, LSL_Vector look_at); 235 void llMapDestination(string simname, LSL_Vector pos, LSL_Vector look_at);
236 LSL_String llMD5String(string src, int nonce); 236 LSL_String llMD5String(string src, int nonce);
237 void llMessageLinked(int linknum, int num, string str, string id); 237 void llMessageLinked(int linknum, int num, string str, string id);
@@ -252,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
252 void llPassTouches(int pass); 252 void llPassTouches(int pass);
253 void llPlaySound(string sound, double volume); 253 void llPlaySound(string sound, double volume);
254 void llPlaySoundSlave(string sound, double volume); 254 void llPlaySoundSlave(string sound, double volume);
255 void llPointAt(); 255 void llPointAt(LSL_Vector pos);
256 LSL_Float llPow(double fbase, double fexponent); 256 LSL_Float llPow(double fbase, double fexponent);
257 void llPreloadSound(string sound); 257 void llPreloadSound(string sound);
258 void llPushObject(string target, LSL_Vector impulse, LSL_Vector ang_impulse, int local); 258 void llPushObject(string target, LSL_Vector impulse, LSL_Vector ang_impulse, int local);
@@ -323,7 +323,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
323 void llSetPayPrice(int price, LSL_List quick_pay_buttons); 323 void llSetPayPrice(int price, LSL_List quick_pay_buttons);
324 void llSetPos(LSL_Vector pos); 324 void llSetPos(LSL_Vector pos);
325 void llSetPrimitiveParams(LSL_List rules); 325 void llSetPrimitiveParams(LSL_List rules);
326 void llSetPrimURL(); 326 void llSetPrimURL(string url);
327 void llSetRemoteScriptAccessPin(int pin); 327 void llSetRemoteScriptAccessPin(int pin);
328 void llSetRot(LSL_Rotation rot); 328 void llSetRot(LSL_Rotation rot);
329 void llSetScale(LSL_Vector scale); 329 void llSetScale(LSL_Vector scale);
@@ -347,7 +347,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
347 LSL_Float llSin(double f); 347 LSL_Float llSin(double f);
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(string sound, double volume, int queue, int loop);
351 void llSoundPreload(string sound); 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);
@@ -382,7 +382,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
382 LSL_Float llWater(LSL_Vector offset); 382 LSL_Float llWater(LSL_Vector offset);
383 void llWhisper(int channelID, string text); 383 void llWhisper(int channelID, string text);
384 LSL_Vector llWind(LSL_Vector offset); 384 LSL_Vector llWind(LSL_Vector offset);
385 void llXorBase64Strings(); 385 LSL_String llXorBase64Strings(string str1, string str2);
386 LSL_String llXorBase64StringsCorrect(string str1, string str2); 386 LSL_String llXorBase64StringsCorrect(string str1, string str2);
387 } 387 }
388} 388}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index bebb011..52916b5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -999,24 +999,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
999 m_LSL_Functions.llLoopSoundSlave(sound, volume); 999 m_LSL_Functions.llLoopSoundSlave(sound, volume);
1000 } 1000 }
1001 1001
1002 public void llMakeExplosion() 1002 public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
1003 { 1003 {
1004 m_LSL_Functions.llMakeExplosion(); 1004 m_LSL_Functions.llMakeExplosion(particles, scale, vel, lifetime, arc, texture, offset);
1005 } 1005 }
1006 1006
1007 public void llMakeFire() 1007 public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
1008 { 1008 {
1009 m_LSL_Functions.llMakeFire(); 1009 m_LSL_Functions.llMakeFire(particles, scale, vel, lifetime, arc, texture, offset);
1010 } 1010 }
1011 1011
1012 public void llMakeFountain() 1012 public void llMakeFountain(int particles, float scale, float vel, float lifetime, float arc, int bounce, string texture, LSL_Vector offset, float bounce_offset)
1013 { 1013 {
1014 m_LSL_Functions.llMakeFountain(); 1014 m_LSL_Functions.llMakeFountain(particles, scale, vel, lifetime, arc, bounce, texture, offset, bounce_offset);
1015 } 1015 }
1016 1016
1017 public void llMakeSmoke() 1017 public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
1018 { 1018 {
1019 m_LSL_Functions.llMakeSmoke(); 1019 m_LSL_Functions.llMakeSmoke(particles, scale, vel, lifetime, arc, texture, offset);
1020 } 1020 }
1021 1021
1022 public void llMapDestination(string simname, LSL_Vector pos, LSL_Vector look_at) 1022 public void llMapDestination(string simname, LSL_Vector pos, LSL_Vector look_at)
@@ -1119,9 +1119,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1119 m_LSL_Functions.llPlaySoundSlave(sound, volume); 1119 m_LSL_Functions.llPlaySoundSlave(sound, volume);
1120 } 1120 }
1121 1121
1122 public void llPointAt() 1122 public void llPointAt(LSL_Vector pos)
1123 { 1123 {
1124 m_LSL_Functions.llPointAt(); 1124 m_LSL_Functions.llPointAt(pos);
1125 } 1125 }
1126 1126
1127 public LSL_Float llPow(double fbase, double fexponent) 1127 public LSL_Float llPow(double fbase, double fexponent)
@@ -1474,9 +1474,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1474 m_LSL_Functions.llSetPrimitiveParams(rules); 1474 m_LSL_Functions.llSetPrimitiveParams(rules);
1475 } 1475 }
1476 1476
1477 public void llSetPrimURL() 1477 public void llSetPrimURL(string url)
1478 { 1478 {
1479 m_LSL_Functions.llSetPrimURL(); 1479 m_LSL_Functions.llSetPrimURL(url);
1480 } 1480 }
1481 1481
1482 public void llSetRemoteScriptAccessPin(int pin) 1482 public void llSetRemoteScriptAccessPin(int pin)
@@ -1594,9 +1594,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1594 m_LSL_Functions.llSleep(sec); 1594 m_LSL_Functions.llSleep(sec);
1595 } 1595 }
1596 1596
1597 public void llSound() 1597 public void llSound(string sound, double volume, int queue, int loop)
1598 { 1598 {
1599 m_LSL_Functions.llSound(); 1599 m_LSL_Functions.llSound(sound, volume, queue, loop);
1600 } 1600 }
1601 1601
1602 public void llSoundPreload(string sound) 1602 public void llSoundPreload(string sound)
@@ -1769,9 +1769,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1769 return m_LSL_Functions.llWind(offset); 1769 return m_LSL_Functions.llWind(offset);
1770 } 1770 }
1771 1771
1772 public void llXorBase64Strings() 1772 public LSL_String llXorBase64Strings(string str1, string str2)
1773 { 1773 {
1774 m_LSL_Functions.llXorBase64Strings(); 1774 return m_LSL_Functions.llXorBase64Strings(str1, str2);
1775 } 1775 }
1776 1776
1777 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 1777 public LSL_String llXorBase64StringsCorrect(string str1, string str2)