aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-31 17:25:18 +0100
committerJustin Clark-Casey (justincc)2011-08-31 17:25:18 +0100
commite69f246b861c824149d8b4e7cc4ff7899d5318db (patch)
tree4f0937e6686c2a87746e173dd724cb524b3340c4 /OpenSim/Region/Framework/Scenes
parentget rid of appearance null checks - this is never null (diff)
downloadopensim-SC_OLD-e69f246b861c824149d8b4e7cc4ff7899d5318db.zip
opensim-SC_OLD-e69f246b861c824149d8b4e7cc4ff7899d5318db.tar.gz
opensim-SC_OLD-e69f246b861c824149d8b4e7cc4ff7899d5318db.tar.bz2
opensim-SC_OLD-e69f246b861c824149d8b4e7cc4ff7899d5318db.tar.xz
refactor: move multiple class to set avatar height into associated SP.AddToPhysicalScene()
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs18
1 files changed, 2 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cda2006..5e96b0a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -900,9 +900,6 @@ namespace OpenSim.Region.Framework.Scenes
900 } 900 }
901 AbsolutePosition = pos; 901 AbsolutePosition = pos;
902 902
903 if (m_appearance.AvatarHeight > 0)
904 SetHeight(m_appearance.AvatarHeight);
905
906 AddToPhysicalScene(isFlying); 903 AddToPhysicalScene(isFlying);
907 904
908 if (m_forceFly) 905 if (m_forceFly)
@@ -1036,10 +1033,6 @@ namespace OpenSim.Region.Framework.Scenes
1036 AbsolutePosition = pos; 1033 AbsolutePosition = pos;
1037 AddToPhysicalScene(isFlying); 1034 AddToPhysicalScene(isFlying);
1038 1035
1039 // FIXME: Move me into AddToPhysicalScene
1040 if (m_appearance.AvatarHeight > 0)
1041 SetHeight(m_appearance.AvatarHeight);
1042
1043 SendTerseUpdateToAllClients(); 1036 SendTerseUpdateToAllClients();
1044 } 1037 }
1045 1038
@@ -1053,9 +1046,6 @@ namespace OpenSim.Region.Framework.Scenes
1053 AbsolutePosition = pos; 1046 AbsolutePosition = pos;
1054 AddToPhysicalScene(isFlying); 1047 AddToPhysicalScene(isFlying);
1055 1048
1056 if (m_appearance.AvatarHeight > 0)
1057 SetHeight(m_appearance.AvatarHeight);
1058
1059 SendTerseUpdateToAllClients(); 1049 SendTerseUpdateToAllClients();
1060 } 1050 }
1061 1051
@@ -1825,12 +1815,6 @@ namespace OpenSim.Region.Framework.Scenes
1825 m_parentID = 0; 1815 m_parentID = 0;
1826 SendAvatarDataToAllAgents(); 1816 SendAvatarDataToAllAgents();
1827 m_requestedSitTargetID = 0; 1817 m_requestedSitTargetID = 0;
1828
1829 if (m_physicsActor != null)
1830 {
1831 if (m_appearance.AvatarHeight > 0)
1832 SetHeight(m_appearance.AvatarHeight);
1833 }
1834 } 1818 }
1835 1819
1836 Animator.TrySetMovementAnimation("STAND"); 1820 Animator.TrySetMovementAnimation("STAND");
@@ -3313,6 +3297,8 @@ namespace OpenSim.Region.Framework.Scenes
3313 m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong 3297 m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
3314 m_physicsActor.SubscribeEvents(500); 3298 m_physicsActor.SubscribeEvents(500);
3315 m_physicsActor.LocalID = LocalId; 3299 m_physicsActor.LocalID = LocalId;
3300
3301 SetHeight(m_appearance.AvatarHeight);
3316 } 3302 }
3317 3303
3318 private void OutOfBoundsCall(Vector3 pos) 3304 private void OutOfBoundsCall(Vector3 pos)