aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorubit2012-12-07 22:28:48 +0100
committerubit2012-12-07 22:28:48 +0100
commitfc33b7e9ebd19ba63710882e559702e5d171ab96 (patch)
tree2a5d82166572668a0cc1b0d9c3a02cb3a9e48cea /OpenSim/Region/Framework
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentrevert the use of avatar skeleton and use avatar size provided by viewers, (diff)
downloadopensim-SC-fc33b7e9ebd19ba63710882e559702e5d171ab96.zip
opensim-SC-fc33b7e9ebd19ba63710882e559702e5d171ab96.tar.gz
opensim-SC-fc33b7e9ebd19ba63710882e559702e5d171ab96.tar.bz2
opensim-SC-fc33b7e9ebd19ba63710882e559702e5d171ab96.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7602d6b..9dfccca 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3443,8 +3443,8 @@ namespace OpenSim.Region.Framework.Scenes
3443 Name, Scene.RegionInfo.RegionName); 3443 Name, Scene.RegionInfo.RegionName);
3444 } 3444 }
3445 3445
3446 if (Appearance.AvatarHeight == 0) 3446// if (Appearance.AvatarHeight == 0)
3447 Appearance.SetHeight(); 3447// Appearance.SetHeight();
3448 3448
3449 PhysicsScene scene = m_scene.PhysicsScene; 3449 PhysicsScene scene = m_scene.PhysicsScene;
3450 3450