diff options
author | Justin Clark-Casey (justincc) | 2011-12-15 22:29:36 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-12-15 22:29:36 +0000 |
commit | c0ba99e5ada0b734b932091befce69dbd53d149a (patch) | |
tree | af614f3e2bcd1b9697e488f8c329e93a3c28a166 /OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs index 1ceed1a..2e14216 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
56 | } | 56 | } |
57 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) | 57 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) |
58 | { | 58 | { |
59 | BasicActor act = new BasicActor(); | 59 | BasicActor act = new BasicActor(size); |
60 | act.Position = position; | 60 | act.Position = position; |
61 | act.Flying = isFlying; | 61 | act.Flying = isFlying; |
62 | _actors.Add(act); | 62 | _actors.Add(act); |