aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorubit2012-12-07 22:54:18 +0100
committerubit2012-12-07 22:54:18 +0100
commit46d0160b79975b81a1c6acbcc6cfe3bd00b048b7 (patch)
tree64b271fbebb3b9df8f8a0c1830e35c14aab905a0 /OpenSim/Region/Framework
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent add some default size setting and checks (diff)
downloadopensim-SC-46d0160b79975b81a1c6acbcc6cfe3bd00b048b7.zip
opensim-SC-46d0160b79975b81a1c6acbcc6cfe3bd00b048b7.tar.gz
opensim-SC-46d0160b79975b81a1c6acbcc6cfe3bd00b048b7.tar.bz2
opensim-SC-46d0160b79975b81a1c6acbcc6cfe3bd00b048b7.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9dfccca..9ada5bb 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3443,8 +3443,9 @@ 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 Appearance.SetSize(new Vector3(0.45f,0.6f,1.9f));
3448 3449
3449 PhysicsScene scene = m_scene.PhysicsScene; 3450 PhysicsScene scene = m_scene.PhysicsScene;
3450 3451