aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorCharles Krinke2008-06-27 19:13:42 +0000
committerCharles Krinke2008-06-27 19:13:42 +0000
commit1646f42a8073bac3509ce8e575f2fb75b64e9266 (patch)
treef5a0060d7d290782380a41a1c29a6ec8ab201ae5 /OpenSim
parentdr scofield's continuing warnings safari: (diff)
downloadopensim-SC_OLD-1646f42a8073bac3509ce8e575f2fb75b64e9266.zip
opensim-SC_OLD-1646f42a8073bac3509ce8e575f2fb75b64e9266.tar.gz
opensim-SC_OLD-1646f42a8073bac3509ce8e575f2fb75b64e9266.tar.bz2
opensim-SC_OLD-1646f42a8073bac3509ce8e575f2fb75b64e9266.tar.xz
Mantis#1615. Thank you, Matth for a patch that:
causes deprecated LSL functions to throw the deprecated exception rather than not-implemented.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs10
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index adf3254..f030e12 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1320,7 +1320,7 @@ namespace OpenSim.Region.Environment.Scenes
1320 srcPart.Name, srcId, srcTaskItem.Name, srcTaskItem.ItemID, destPart.Name, destId, pin); 1320 srcPart.Name, srcId, srcTaskItem.Name, srcTaskItem.ItemID, destPart.Name, destId, pin);
1321 // the LSL Wiki says we are supposed to shout on the DEBUG_CHANNEL - 1321 // the LSL Wiki says we are supposed to shout on the DEBUG_CHANNEL -
1322 // "Object: Task Object trying to illegally load script onto task Other_Object!" 1322 // "Object: Task Object trying to illegally load script onto task Other_Object!"
1323 // How do we should from in here? 1323 // How do we shout from in here?
1324 return; 1324 return;
1325 } 1325 }
1326 1326
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 7df1173..28a512b 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -1940,25 +1940,25 @@ namespace OpenSim.Region.ScriptEngine.Common
1940 public void llMakeExplosion() 1940 public void llMakeExplosion()
1941 { 1941 {
1942 m_host.AddScriptLPS(1); 1942 m_host.AddScriptLPS(1);
1943 NotImplemented("llMakeExplosion"); 1943 Deprecated("llMakeExplosion");
1944 } 1944 }
1945 1945
1946 public void llMakeFountain() 1946 public void llMakeFountain()
1947 { 1947 {
1948 m_host.AddScriptLPS(1); 1948 m_host.AddScriptLPS(1);
1949 NotImplemented("llMakeFountain"); 1949 Deprecated("llMakeFountain");
1950 } 1950 }
1951 1951
1952 public void llMakeSmoke() 1952 public void llMakeSmoke()
1953 { 1953 {
1954 m_host.AddScriptLPS(1); 1954 m_host.AddScriptLPS(1);
1955 NotImplemented("llMakeSmoke"); 1955 Deprecated("llMakeSmoke");
1956 } 1956 }
1957 1957
1958 public void llMakeFire() 1958 public void llMakeFire()
1959 { 1959 {
1960 m_host.AddScriptLPS(1); 1960 m_host.AddScriptLPS(1);
1961 NotImplemented("llMakeFire"); 1961 Deprecated("llMakeFire");
1962 } 1962 }
1963 1963
1964 public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param) 1964 public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param)
@@ -2236,7 +2236,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2236 public void llSoundPreload() 2236 public void llSoundPreload()
2237 { 2237 {
2238 m_host.AddScriptLPS(1); 2238 m_host.AddScriptLPS(1);
2239 NotImplemented("llSoundPreload"); 2239 Deprecated("llSoundPreload");
2240 } 2240 }
2241 2241
2242 public void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping) 2242 public void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping)