diff options
| author | diva | 2009-02-15 06:12:11 +0000 |
|---|---|---|
| committer | diva | 2009-02-15 06:12:11 +0000 |
| commit | 9b19c65450ae9e4fb79ecc315c96614269485a81 (patch) | |
| tree | 8196dc223ab33f92c6fc208a27c04a23fce67383 /OpenSim/Region | |
| parent | Moving SendInitialData sort of back to where it was before, so that it doesn'... (diff) | |
| download | opensim-SC_OLD-9b19c65450ae9e4fb79ecc315c96614269485a81.zip opensim-SC_OLD-9b19c65450ae9e4fb79ecc315c96614269485a81.tar.gz opensim-SC_OLD-9b19c65450ae9e4fb79ecc315c96614269485a81.tar.bz2 opensim-SC_OLD-9b19c65450ae9e4fb79ecc315c96614269485a81.tar.xz | |
Guarding the new call to SetHeight in MakeRoot, so that ODE doesn't complain when it's 0.
Diffstat (limited to 'OpenSim/Region')
| -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 69397eb..d590d99 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -845,7 +845,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 845 | AbsolutePosition = pos; | 845 | AbsolutePosition = pos; |
| 846 | 846 | ||
| 847 | AddToPhysicalScene(isFlying); | 847 | AddToPhysicalScene(isFlying); |
| 848 | if (m_appearance != null) | 848 | if ((m_appearance != null) && (m_appearance.AvatarHeight > 0)) |
| 849 | SetHeight(m_appearance.AvatarHeight); | 849 | SetHeight(m_appearance.AvatarHeight); |
| 850 | 850 | ||
| 851 | // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying | 851 | // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying |