aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authormeta72010-08-18 02:53:27 -0700
committermeta72010-08-18 02:53:27 -0700
commitca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch)
tree2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parentFix a nullref exception in the prioritizer (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip
opensim-SC_OLD-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz
opensim-SC_OLD-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2
opensim-SC_OLD-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-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 9bece31..e3a69a8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4405,7 +4405,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4405 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4405 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4406 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 4406 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
4407 { 4407 {
4408 presence.ControllingClient.SendTeleportLocationStart();
4409 World.TeleportClientHome(agentId, presence.ControllingClient); 4408 World.TeleportClientHome(agentId, presence.ControllingClient);
4410 } 4409 }
4411 } 4410 }