diff options
| author | ubit | 2012-12-07 16:56:36 +0100 |
|---|---|---|
| committer | ubit | 2012-12-07 16:56:36 +0100 |
| commit | 0a131bf9a785c92fca464eb75f3bf73595f5abb2 (patch) | |
| tree | 36b1bd1ab7f84fda0fa33801050a8a7ad4b62b0b /OpenSim/Framework | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | *TEST* Use new avatar size in ubitODE. (diff) | |
| download | opensim-SC-0a131bf9a785c92fca464eb75f3bf73595f5abb2.zip opensim-SC-0a131bf9a785c92fca464eb75f3bf73595f5abb2.tar.gz opensim-SC-0a131bf9a785c92fca464eb75f3bf73595f5abb2.tar.bz2 opensim-SC-0a131bf9a785c92fca464eb75f3bf73595f5abb2.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/AvatarSkeleton.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/AvatarSkeleton.cs b/OpenSim/Framework/AvatarSkeleton.cs index 269099b..7a49f22 100644 --- a/OpenSim/Framework/AvatarSkeleton.cs +++ b/OpenSim/Framework/AvatarSkeleton.cs | |||
| @@ -275,7 +275,8 @@ namespace OpenSim.Framework | |||
| 275 | size += pelvisToFoot; | 275 | size += pelvisToFoot; |
| 276 | 276 | ||
| 277 | m_standSize = new Vector3(0.45f, 0.6f, size); | 277 | m_standSize = new Vector3(0.45f, 0.6f, size); |
| 278 | m_feetOffset = 0.5f * size - pelvisToFoot; | 278 | // m_feetOffset = 0.5f * size - pelvisToFoot; |
| 279 | m_feetOffset = 0.0f; | ||
| 279 | } | 280 | } |
| 280 | } | 281 | } |
| 281 | } | 282 | } |