aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDavid Rowe2014-01-24 16:46:10 -0800
committerJustin Clark-Casey (justincc)2014-01-31 00:24:36 +0000
commitc9550e473d7c9ec64d1cbffc8005f03a1aef13db (patch)
tree083d7c449eb376d5130691dfd0c81560716e1845 /OpenSim/Region
parentUpdated "not implemented" LSL errors to use NotImplemented() (diff)
downloadopensim-SC_OLD-c9550e473d7c9ec64d1cbffc8005f03a1aef13db.zip
opensim-SC_OLD-c9550e473d7c9ec64d1cbffc8005f03a1aef13db.tar.gz
opensim-SC_OLD-c9550e473d7c9ec64d1cbffc8005f03a1aef13db.tar.bz2
opensim-SC_OLD-c9550e473d7c9ec64d1cbffc8005f03a1aef13db.tar.xz
Updated "deprecated" LSL errors to use Deprecrated()
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs30
1 files changed, 11 insertions, 19 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6b203ab..33dd77f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2553,9 +2553,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2553 public void llSound(string sound, double volume, int queue, int loop) 2553 public void llSound(string sound, double volume, int queue, int loop)
2554 { 2554 {
2555 m_host.AddScriptLPS(1); 2555 m_host.AddScriptLPS(1);
2556 // This function has been deprecated 2556 Deprecated("llSound", "Use llPlaySound instead");
2557 // see http://www.lslwiki.net/lslwiki/wakka.php?wakka=llSound
2558 Deprecated("llSound");
2559 } 2557 }
2560 2558
2561 // Xantor 20080528 PlaySound updated so it accepts an objectinventory name -or- a key to a sound 2559 // Xantor 20080528 PlaySound updated so it accepts an objectinventory name -or- a key to a sound
@@ -2914,28 +2912,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2914 public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) 2912 public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
2915 { 2913 {
2916 m_host.AddScriptLPS(1); 2914 m_host.AddScriptLPS(1);
2917 Deprecated("llMakeExplosion"); 2915 Deprecated("llMakeExplosion", "Use llParticleSystem instead");
2918 ScriptSleep(100); 2916 ScriptSleep(100);
2919 } 2917 }
2920 2918
2921 public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset) 2919 public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset)
2922 { 2920 {
2923 m_host.AddScriptLPS(1); 2921 m_host.AddScriptLPS(1);
2924 Deprecated("llMakeFountain"); 2922 Deprecated("llMakeFountain", "Use llParticleSystem instead");
2925 ScriptSleep(100); 2923 ScriptSleep(100);
2926 } 2924 }
2927 2925
2928 public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) 2926 public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
2929 { 2927 {
2930 m_host.AddScriptLPS(1); 2928 m_host.AddScriptLPS(1);
2931 Deprecated("llMakeSmoke"); 2929 Deprecated("llMakeSmoke", "Use llParticleSystem instead");
2932 ScriptSleep(100); 2930 ScriptSleep(100);
2933 } 2931 }
2934 2932
2935 public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) 2933 public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
2936 { 2934 {
2937 m_host.AddScriptLPS(1); 2935 m_host.AddScriptLPS(1);
2938 Deprecated("llMakeFire"); 2936 Deprecated("llMakeFire", "Use llParticleSystem instead");
2939 ScriptSleep(100); 2937 ScriptSleep(100);
2940 } 2938 }
2941 2939
@@ -3236,13 +3234,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3236 public void llTakeCamera(string avatar) 3234 public void llTakeCamera(string avatar)
3237 { 3235 {
3238 m_host.AddScriptLPS(1); 3236 m_host.AddScriptLPS(1);
3239 Deprecated("llTakeCamera"); 3237 Deprecated("llTakeCamera", "Use llSetCameraParams instead");
3240 } 3238 }
3241 3239
3242 public void llReleaseCamera(string avatar) 3240 public void llReleaseCamera(string avatar)
3243 { 3241 {
3244 m_host.AddScriptLPS(1); 3242 m_host.AddScriptLPS(1);
3245 Deprecated("llReleaseCamera"); 3243 Deprecated("llReleaseCamera", "Use llClearCameraParams instead");
3246 } 3244 }
3247 3245
3248 public LSL_String llGetOwner() 3246 public LSL_String llGetOwner()
@@ -3422,13 +3420,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3422 } 3420 }
3423 } 3421 }
3424 3422
3425 /// <summary>
3426 /// llSoundPreload is deprecated. In SL this appears to do absolutely nothing
3427 /// and is documented to have no delay.
3428 /// </summary>
3429 public void llSoundPreload(string sound) 3423 public void llSoundPreload(string sound)
3430 { 3424 {
3431 m_host.AddScriptLPS(1); 3425 m_host.AddScriptLPS(1);
3426 Deprecated("llSoundPreload", "Use llPreloadSound instead");
3432 } 3427 }
3433 3428
3434 public void llRotLookAt(LSL_Rotation target, double strength, double damping) 3429 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
@@ -8000,7 +7995,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8000 public LSL_String llXorBase64Strings(string str1, string str2) 7995 public LSL_String llXorBase64Strings(string str1, string str2)
8001 { 7996 {
8002 m_host.AddScriptLPS(1); 7997 m_host.AddScriptLPS(1);
8003 Deprecated("llXorBase64Strings"); 7998 Deprecated("llXorBase64Strings", "Use llXorBase64 instead");
8004 ScriptSleep(300); 7999 ScriptSleep(300);
8005 return String.Empty; 8000 return String.Empty;
8006 } 8001 }
@@ -8008,7 +8003,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8008 public void llRemoteDataSetRegion() 8003 public void llRemoteDataSetRegion()
8009 { 8004 {
8010 m_host.AddScriptLPS(1); 8005 m_host.AddScriptLPS(1);
8011 Deprecated("llRemoteDataSetRegion"); 8006 Deprecated("llRemoteDataSetRegion", "Use llOpenRemoteDataChannel instead");
8012 } 8007 }
8013 8008
8014 public LSL_Float llLog10(double val) 8009 public LSL_Float llLog10(double val)
@@ -10364,13 +10359,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10364 return Quaternion.Identity; 10359 return Quaternion.Identity;
10365 } 10360 }
10366 10361
10367 /// <summary>
10368 /// The SL implementation does nothing, it is deprecated
10369 /// This duplicates SL
10370 /// </summary>
10371 public void llSetPrimURL(string url) 10362 public void llSetPrimURL(string url)
10372 { 10363 {
10373 m_host.AddScriptLPS(1); 10364 m_host.AddScriptLPS(1);
10365 Deprecated("llSetPrimURL", "Use llSetPrimMediaParams instead");
10374 ScriptSleep(2000); 10366 ScriptSleep(2000);
10375 } 10367 }
10376 10368