aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-16 22:53:49 +0000
committerTeravus Ovares2008-01-16 22:53:49 +0000
commitfeba36aaf3c456d3ee10fb5d12c3bd42d0801779 (patch)
tree937f0f637b7e6fef22031367a06ef9162e99a773 /OpenSim
parent* More prim inventory synchronization (diff)
downloadopensim-SC_OLD-feba36aaf3c456d3ee10fb5d12c3bd42d0801779.zip
opensim-SC_OLD-feba36aaf3c456d3ee10fb5d12c3bd42d0801779.tar.gz
opensim-SC_OLD-feba36aaf3c456d3ee10fb5d12c3bd42d0801779.tar.bz2
opensim-SC_OLD-feba36aaf3c456d3ee10fb5d12c3bd42d0801779.tar.xz
* Fixed standing up so that you're at the new position of the prim if you move the prim and then stand up!
* Enter llSetPos elevators and conveyors n' stuff.!
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 30ad4a5..959e6ee 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -790,14 +790,17 @@ namespace OpenSim.Region.Environment.Scenes
790 // Reset sit target. 790 // Reset sit target.
791 if (part.GetAvatarOnSitTarget() == UUID) 791 if (part.GetAvatarOnSitTarget() == UUID)
792 part.SetAvatarOnSitTarget(LLUUID.Zero); 792 part.SetAvatarOnSitTarget(LLUUID.Zero);
793 }
794 793
795 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); 794 m_parentPosition = part.GetWorldPosition();
796 m_parentPosition = new LLVector3(); 795 }
797 796
798 if (m_physicsActor == null) 797 if (m_physicsActor == null)
799 AddToPhysicalScene(); 798 AddToPhysicalScene();
800 799
800 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
801 m_parentPosition = new LLVector3();
802
803
801 m_parentID = 0; 804 m_parentID = 0;
802 SendFullUpdateToAllClients(); 805 SendFullUpdateToAllClients();
803 } 806 }