diff options
| author | Melanie | 2013-04-04 03:17:38 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-04 03:17:38 +0100 |
| commit | b16a560b779b925425ded0b4a84c4c0c04487883 (patch) | |
| tree | 11c06ea200f47f04e4068ce146431f3bdef240f6 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Stop falsely logging that a teleport was being aborted on client logou... (diff) | |
| download | opensim-SC-b16a560b779b925425ded0b4a84c4c0c04487883.zip opensim-SC-b16a560b779b925425ded0b4a84c4c0c04487883.tar.gz opensim-SC-b16a560b779b925425ded0b4a84c4c0c04487883.tar.bz2 opensim-SC-b16a560b779b925425ded0b4a84c4c0c04487883.tar.xz | |
Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 25fd62f..ec7c3fa 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -1224,17 +1224,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1224 | 1224 | ||
| 1225 | public Quaternion SitTargetOrientationLL | 1225 | public Quaternion SitTargetOrientationLL |
| 1226 | { | 1226 | { |
| 1227 | get | 1227 | get { return m_sitTargetOrientation; } |
| 1228 | { | 1228 | set { m_sitTargetOrientation = value; } |
| 1229 | return new Quaternion( | ||
| 1230 | m_sitTargetOrientation.X, | ||
| 1231 | m_sitTargetOrientation.Y, | ||
| 1232 | m_sitTargetOrientation.Z, | ||
| 1233 | m_sitTargetOrientation.W | ||
| 1234 | ); | ||
| 1235 | } | ||
| 1236 | |||
| 1237 | set { m_sitTargetOrientation = new Quaternion(value.X, value.Y, value.Z, value.W); } | ||
| 1238 | } | 1229 | } |
| 1239 | 1230 | ||
| 1240 | public bool Stopped | 1231 | public bool Stopped |