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/BasicPhysicsActor.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-c0ba99e5ada0b734b932091befce69dbd53d149a.zip opensim-SC-c0ba99e5ada0b734b932091befce69dbd53d149a.tar.gz opensim-SC-c0ba99e5ada0b734b932091befce69dbd53d149a.tar.bz2 opensim-SC-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/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs index 5e2eeeb..1e1d5e3 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | |||
| @@ -44,8 +44,9 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
| 44 | private bool flying; | 44 | private bool flying; |
| 45 | private bool iscolliding; | 45 | private bool iscolliding; |
| 46 | 46 | ||
| 47 | public BasicActor() | 47 | public BasicActor(Vector3 size) |
| 48 | { | 48 | { |
| 49 | Size = size; | ||
| 49 | } | 50 | } |
| 50 | 51 | ||
| 51 | public override int PhysicsActorType | 52 | public override int PhysicsActorType |