aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-01-13 20:21:53 +0100
committerMelanie2011-01-13 20:21:53 +0100
commit4eefdd5549cd40a9f4204f2e644f2ddbc7d51b28 (patch)
treefa2e4b5c771d6cb74ad574b51a4b62fa35e32565 /OpenSim/Region/Framework/Scenes
parentImplement kicking, freezing and unfreezing users in the same sim via (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC-4eefdd5549cd40a9f4204f2e644f2ddbc7d51b28.zip
opensim-SC-4eefdd5549cd40a9f4204f2e644f2ddbc7d51b28.tar.gz
opensim-SC-4eefdd5549cd40a9f4204f2e644f2ddbc7d51b28.tar.bz2
opensim-SC-4eefdd5549cd40a9f4204f2e644f2ddbc7d51b28.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-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 b8ad3ca..927f78d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1866,7 +1866,7 @@ namespace OpenSim.Region.Framework.Scenes
1866 Quaternion partIRot = Quaternion.Inverse(partRot); 1866 Quaternion partIRot = Quaternion.Inverse(partRot);
1867 1867
1868 Quaternion avatarRot = Quaternion.Inverse(Quaternion.Inverse(Rotation) * partIRot); // world or. of the av 1868 Quaternion avatarRot = Quaternion.Inverse(Quaternion.Inverse(Rotation) * partIRot); // world or. of the av
1869 Vector3 avStandUp = new Vector3(1.0f, 0f, 0f) * avatarRot; // 1M infront of av 1869 Vector3 avStandUp = new Vector3(0.3f, 0f, 0f) * avatarRot; // 0.3M infront of av
1870 1870
1871 1871
1872 if (m_physicsActor == null) 1872 if (m_physicsActor == null)