aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-10-30 19:17:52 +0100
committerMelanie2010-10-30 19:17:52 +0100
commit623cee1ffc2f2362982242593652904691e80fce (patch)
tree039f29d92aee894bcd525cf2c7d5d23e8efc1a08 /OpenSim/Region/Framework/Scenes
parentFix logins and avatar appearance. Contains a Migration. May contain nuts. (diff)
downloadopensim-SC-623cee1ffc2f2362982242593652904691e80fce.zip
opensim-SC-623cee1ffc2f2362982242593652904691e80fce.tar.gz
opensim-SC-623cee1ffc2f2362982242593652904691e80fce.tar.bz2
opensim-SC-623cee1ffc2f2362982242593652904691e80fce.tar.xz
Move physics actor creation to after SetHeight to try and prevent
bowlegginess. Didn't work but is better this way anyway.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 52e7462..8defe68 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -858,17 +858,6 @@ namespace OpenSim.Region.Framework.Scenes
858 } 858 }
859 AbsolutePosition = pos; 859 AbsolutePosition = pos;
860 860
861 AddToPhysicalScene(isFlying);
862
863 if (m_forceFly)
864 {
865 m_physicsActor.Flying = true;
866 }
867 else if (m_flyDisabled)
868 {
869 m_physicsActor.Flying = false;
870 }
871
872 if (m_appearance != null) 861 if (m_appearance != null)
873 { 862 {
874 if (m_appearance.AvatarHeight > 0) 863 if (m_appearance.AvatarHeight > 0)
@@ -881,6 +870,17 @@ namespace OpenSim.Region.Framework.Scenes
881 m_appearance = new AvatarAppearance(UUID); 870 m_appearance = new AvatarAppearance(UUID);
882 } 871 }
883 872
873 AddToPhysicalScene(isFlying);
874
875 if (m_forceFly)
876 {
877 m_physicsActor.Flying = true;
878 }
879 else if (m_flyDisabled)
880 {
881 m_physicsActor.Flying = false;
882 }
883
884 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 884 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying
885 // avatar to return to the standing position in mid-air. On login it looks like this is being sent 885 // avatar to return to the standing position in mid-air. On login it looks like this is being sent
886 // elsewhere anyway 886 // elsewhere anyway