diff options
| author | Diva Canto | 2011-06-16 17:15:12 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-06-16 17:15:12 -0700 |
| commit | 7819b4a794f5d20e9ff7e847f3063d5250d83aef (patch) | |
| tree | 1b76ea3d77c34cc518a477342ad93cdb5ff55fd4 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Added a couple of guards and warnings to the MapImage/MapImageServiceModule. (diff) | |
| parent | Add localID to physical object creation functions. (diff) | |
| download | opensim-SC-7819b4a794f5d20e9ff7e847f3063d5250d83aef.zip opensim-SC-7819b4a794f5d20e9ff7e847f3063d5250d83aef.tar.gz opensim-SC-7819b4a794f5d20e9ff7e847f3063d5250d83aef.tar.bz2 opensim-SC-7819b4a794f5d20e9ff7e847f3063d5250d83aef.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f6295b1..80aafd0 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3295,7 +3295,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3295 | Vector3 pVec = AbsolutePosition; | 3295 | Vector3 pVec = AbsolutePosition; |
| 3296 | 3296 | ||
| 3297 | // Old bug where the height was in centimeters instead of meters | 3297 | // Old bug where the height was in centimeters instead of meters |
| 3298 | m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec, | 3298 | m_physicsActor = scene.AddAvatar(LocalId, Firstname + "." + Lastname, pVec, |
| 3299 | new Vector3(0f, 0f, m_appearance.AvatarHeight), isFlying); | 3299 | new Vector3(0f, 0f, m_appearance.AvatarHeight), isFlying); |
| 3300 | 3300 | ||
| 3301 | scene.AddPhysicsActorTaint(m_physicsActor); | 3301 | scene.AddPhysicsActorTaint(m_physicsActor); |