aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorubit2012-12-13 08:47:01 +0100
committerubit2012-12-13 08:47:01 +0100
commit21f3d193d96c4fe9bf3190e60eaa1b9c5211b983 (patch)
tree41f2037f5464824602184284942a043a60afc7ee /OpenSim/Region
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentfix the 'fix' (diff)
downloadopensim-SC-21f3d193d96c4fe9bf3190e60eaa1b9c5211b983.zip
opensim-SC-21f3d193d96c4fe9bf3190e60eaa1b9c5211b983.tar.gz
opensim-SC-21f3d193d96c4fe9bf3190e60eaa1b9c5211b983.tar.bz2
opensim-SC-21f3d193d96c4fe9bf3190e60eaa1b9c5211b983.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region')
-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 92a4748..45cae51 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -564,7 +564,7 @@ namespace OpenSim.Region.Framework.Scenes
564// Scene.RegionInfo.RegionName, Name, m_velocity); 564// Scene.RegionInfo.RegionName, Name, m_velocity);
565 } 565 }
566 } 566 }
567// 567/*
568 public override Vector3 AngularVelocity 568 public override Vector3 AngularVelocity
569 { 569 {
570 get 570 get
@@ -581,7 +581,7 @@ namespace OpenSim.Region.Framework.Scenes
581 return m_rotationalvelocity; 581 return m_rotationalvelocity;
582 } 582 }
583 } 583 }
584// 584/*
585 private Quaternion m_bodyRot = Quaternion.Identity; 585 private Quaternion m_bodyRot = Quaternion.Identity;
586 586
587 public Quaternion Rotation 587 public Quaternion Rotation