aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorubit2012-05-19 19:16:17 +0200
committerubit2012-05-19 19:16:17 +0200
commite6d228dc0d859d2d88e9edc43f6b5bed124af7b2 (patch)
tree267c8ad30ea0141366269924723a7a60ca637105
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable... (diff)
downloadopensim-SC-e6d228dc0d859d2d88e9edc43f6b5bed124af7b2.zip
opensim-SC-e6d228dc0d859d2d88e9edc43f6b5bed124af7b2.tar.gz
opensim-SC-e6d228dc0d859d2d88e9edc43f6b5bed124af7b2.tar.bz2
opensim-SC-e6d228dc0d859d2d88e9edc43f6b5bed124af7b2.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index be94508..5a3b518 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2032,7 +2032,7 @@ namespace OpenSim.Region.Framework.Scenes
2032// m_log.DebugFormat("[SCENE PRESENCE]: {0} {1}", SitTargetisSet, SitTargetUnOccupied); 2032// m_log.DebugFormat("[SCENE PRESENCE]: {0} {1}", SitTargetisSet, SitTargetUnOccupied);
2033 2033
2034 if (PhysicsActor != null) 2034 if (PhysicsActor != null)
2035 m_sitAvatarHeight = PhysicsActor.Size.Z; 2035 m_sitAvatarHeight = PhysicsActor.Size.Z * 0.5f;
2036 2036
2037 bool canSit = false; 2037 bool canSit = false;
2038 pos = part.AbsolutePosition + offset; 2038 pos = part.AbsolutePosition + offset;