aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-08-25 23:49:37 +0200
committerMelanie2012-08-25 23:49:37 +0200
commitbfa22e2f52780d532db9b8a59f9751390d072c2c (patch)
tree6b82de6d3ebb029f360de5fa7efd8db653d5a188 /OpenSim/Region
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC-bfa22e2f52780d532db9b8a59f9751390d072c2c.zip
opensim-SC-bfa22e2f52780d532db9b8a59f9751390d072c2c.tar.gz
opensim-SC-bfa22e2f52780d532db9b8a59f9751390d072c2c.tar.bz2
opensim-SC-bfa22e2f52780d532db9b8a59f9751390d072c2c.tar.xz
Make llCollisionSprite not throw anymore
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d8ef772..5830eff 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12818,7 +12818,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12818 public void llCollisionSprite(string impact_sprite) 12818 public void llCollisionSprite(string impact_sprite)
12819 { 12819 {
12820 m_host.AddScriptLPS(1); 12820 m_host.AddScriptLPS(1);
12821 NotImplemented("llCollisionSprite"); 12821 // Viewer 2.0 broke this and it's likely LL has no intention
12822 // of fixing it. Therefore, letting this be a NOP seems appropriate.
12822 } 12823 }
12823 12824
12824 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 12825 public void llGodLikeRezObject(string inventory, LSL_Vector pos)