aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-16 14:10:54 +0000
committerTeravus Ovares2008-04-16 14:10:54 +0000
commit7c1f17b994ca987df2167101054f523cc33d7fb9 (patch)
tree19c74ddb0973e84fb6c2b31493efa4847a7b4f44 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parentAfter reading Timer.cs in the mono source, I'm not (diff)
downloadopensim-SC_OLD-7c1f17b994ca987df2167101054f523cc33d7fb9.zip
opensim-SC_OLD-7c1f17b994ca987df2167101054f523cc33d7fb9.tar.gz
opensim-SC_OLD-7c1f17b994ca987df2167101054f523cc33d7fb9.tar.bz2
opensim-SC_OLD-7c1f17b994ca987df2167101054f523cc33d7fb9.tar.xz
* Applying melanie's Landmark patch. Thanks Melanie!
* To make a landmark, you currently have to enable admin options in the advanced menu first. We're working on this.. however use the admin options solution in the mean time.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 795224e..8b8373d 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -270,6 +270,7 @@ namespace OpenSim.Region.Environment.Scenes
270 } 270 }
271 271
272 m_pos = value; 272 m_pos = value;
273 m_parentPosition=new LLVector3(0, 0, 0);
273 } 274 }
274 } 275 }
275 276
@@ -602,7 +603,10 @@ namespace OpenSim.Region.Environment.Scenes
602 /// <param name="pos"></param> 603 /// <param name="pos"></param>
603 public void Teleport(LLVector3 pos) 604 public void Teleport(LLVector3 pos)
604 { 605 {
606 RemoveFromPhysicalScene();
607 Velocity = new LLVector3(0, 0, 0);
605 AbsolutePosition = pos; 608 AbsolutePosition = pos;
609 AddToPhysicalScene();
606 SendTerseUpdateToAllClients(); 610 SendTerseUpdateToAllClients();
607 } 611 }
608 612