aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorMelanie2009-12-22 00:41:56 +0000
committerMelanie2009-12-22 00:41:56 +0000
commitfa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f (patch)
treef644f2171b694ac6997c887ba442be9770fdce73 /OpenSim/Region/ScriptEngine/Shared/Api
parentMerge branch 'master' into careminster (diff)
parentGlue code for a couple of new LSL function implementations (diff)
downloadopensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.zip
opensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.gz
opensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.bz2
opensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs1
1 files changed, 0 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 c3edaef..28932b6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2742,7 +2742,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2742 2742
2743 } 2743 }
2744 2744
2745
2746 public void llStopLookAt() 2745 public void llStopLookAt()
2747 { 2746 {
2748 m_host.AddScriptLPS(1); 2747 m_host.AddScriptLPS(1);