aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-15 22:29:36 +0000
committerJustin Clark-Casey (justincc)2011-12-15 22:29:36 +0000
commitc0ba99e5ada0b734b932091befce69dbd53d149a (patch)
treeaf614f3e2bcd1b9697e488f8c329e93a3c28a166 /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-c0ba99e5ada0b734b932091befce69dbd53d149a.zip
opensim-SC_OLD-c0ba99e5ada0b734b932091befce69dbd53d149a.tar.gz
opensim-SC_OLD-c0ba99e5ada0b734b932091befce69dbd53d149a.tar.bz2
opensim-SC_OLD-c0ba99e5ada0b734b932091befce69dbd53d149a.tar.xz
Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() when we've already passed size information to the avatar at PhysicsScene.AddAvatar()
Eliminate some copypasta for height setting in OdeCharacter
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6f5b6fe..ac58dae 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1149,13 +1149,11 @@ namespace OpenSim.Region.Framework.Scenes
1149 /// <summary> 1149 /// <summary>
1150 /// Sets avatar height in the physics plugin 1150 /// Sets avatar height in the physics plugin
1151 /// </summary> 1151 /// </summary>
1152 /// <param name="height">New height of avatar</param>
1152 public void SetHeight(float height) 1153 public void SetHeight(float height)
1153 { 1154 {
1154 if (PhysicsActor != null && !IsChildAgent) 1155 if (PhysicsActor != null && !IsChildAgent)
1155 { 1156 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height);
1156 Vector3 SetSize = new Vector3(0.45f, 0.6f, height);
1157 PhysicsActor.Size = SetSize;
1158 }
1159 } 1157 }
1160 1158
1161 /// <summary> 1159 /// <summary>
@@ -3273,8 +3271,6 @@ namespace OpenSim.Region.Framework.Scenes
3273 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong 3271 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
3274 PhysicsActor.SubscribeEvents(500); 3272 PhysicsActor.SubscribeEvents(500);
3275 PhysicsActor.LocalID = LocalId; 3273 PhysicsActor.LocalID = LocalId;
3276
3277 SetHeight(Appearance.AvatarHeight);
3278 } 3274 }
3279 3275
3280 private void OutOfBoundsCall(Vector3 pos) 3276 private void OutOfBoundsCall(Vector3 pos)