aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorubit2012-12-07 16:56:36 +0100
committerubit2012-12-07 16:56:36 +0100
commit0a131bf9a785c92fca464eb75f3bf73595f5abb2 (patch)
tree36b1bd1ab7f84fda0fa33801050a8a7ad4b62b0b /OpenSim/Region/Framework
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent*TEST* Use new avatar size in ubitODE. (diff)
downloadopensim-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/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f5d609d..b6eae8e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1260,6 +1260,12 @@ namespace OpenSim.Region.Framework.Scenes
1260 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height); 1260 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height);
1261 } 1261 }
1262 1262
1263 public void SetSize(Vector3 size, float feetoffset)
1264 {
1265 if (PhysicsActor != null && !IsChildAgent)
1266 PhysicsActor.setAvatarSize(size, feetoffset);
1267 }
1268
1263 /// <summary> 1269 /// <summary>
1264 /// Complete Avatar's movement into the region. 1270 /// Complete Avatar's movement into the region.
1265 /// </summary> 1271 /// </summary>