aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorubit2012-12-07 21:07:27 +0100
committerubit2012-12-07 21:07:27 +0100
commit926db81c5713e3e57b8f5d97ad7ebe7ea25784f3 (patch)
tree01611d4e7450954fbfb192989b064f3166a5b369 /OpenSim/Region/Framework
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent create a new ode character also with the new information (diff)
downloadopensim-SC-926db81c5713e3e57b8f5d97ad7ebe7ea25784f3.zip
opensim-SC-926db81c5713e3e57b8f5d97ad7ebe7ea25784f3.tar.gz
opensim-SC-926db81c5713e3e57b8f5d97ad7ebe7ea25784f3.tar.bz2
opensim-SC-926db81c5713e3e57b8f5d97ad7ebe7ea25784f3.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 b6eae8e..7602d6b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3450,9 +3450,15 @@ namespace OpenSim.Region.Framework.Scenes
3450 3450
3451 Vector3 pVec = AbsolutePosition; 3451 Vector3 pVec = AbsolutePosition;
3452 3452
3453/*
3453 PhysicsActor = scene.AddAvatar( 3454 PhysicsActor = scene.AddAvatar(
3454 LocalId, Firstname + "." + Lastname, pVec, 3455 LocalId, Firstname + "." + Lastname, pVec,
3455 new Vector3(0.45f, 0.6f, Appearance.AvatarHeight), isFlying); 3456 new Vector3(0.45f, 0.6f, Appearance.AvatarHeight), isFlying);
3457*/
3458
3459 PhysicsActor = scene.AddAvatar(
3460 LocalId, Firstname + "." + Lastname, pVec,
3461 Appearance.AvatarBoxSize,Appearance.AvatarFeetOffset, isFlying);
3456 3462
3457 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; 3463 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
3458 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 3464 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;