diff options
| author | Melanie | 2012-10-17 20:46:38 +0200 |
|---|---|---|
| committer | Melanie | 2012-10-17 20:46:38 +0200 |
| commit | 0ca96669321b1a33190d0d93ae8f7b3aee60f492 (patch) | |
| tree | ac3b6297630f461f468a13550eaabe571f993ac6 /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |
| parent | Allow the console to be used by gods as well as region owners. (diff) | |
| parent | coment a debug warning (diff) | |
| download | opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.zip opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.gz opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.bz2 opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index c363310..f5bf05d 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
| @@ -172,7 +172,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 172 | // force lower density for testing | 172 | // force lower density for testing |
| 173 | m_density = 3.0f; | 173 | m_density = 3.0f; |
| 174 | 174 | ||
| 175 | |||
| 176 | mu = parent_scene.AvatarFriction; | 175 | mu = parent_scene.AvatarFriction; |
| 177 | 176 | ||
| 178 | walkDivisor = walk_divisor; | 177 | walkDivisor = walk_divisor; |