aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2013-04-02 23:48:01 +0100
committerMelanie2013-04-02 23:48:01 +0100
commitc10331c8c2573af1ed4fcd55ffa8b825ca9582a6 (patch)
tree391647a2a82c1de0b6d5a427d6b45be60dec024f /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster (diff)
parentfix minor race condition in SOP.SitTargetPositionLL where inconsistency could... (diff)
downloadopensim-SC-c10331c8c2573af1ed4fcd55ffa8b825ca9582a6.zip
opensim-SC-c10331c8c2573af1ed4fcd55ffa8b825ca9582a6.tar.gz
opensim-SC-c10331c8c2573af1ed4fcd55ffa8b825ca9582a6.tar.bz2
opensim-SC-c10331c8c2573af1ed4fcd55ffa8b825ca9582a6.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 48ee6ea..397febe 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1218,7 +1218,7 @@ namespace OpenSim.Region.Framework.Scenes
1218 // the mappings more consistant. 1218 // the mappings more consistant.
1219 public Vector3 SitTargetPositionLL 1219 public Vector3 SitTargetPositionLL
1220 { 1220 {
1221 get { return new Vector3(m_sitTargetPosition.X, m_sitTargetPosition.Y,m_sitTargetPosition.Z); } 1221 get { return m_sitTargetPosition; }
1222 set { m_sitTargetPosition = value; } 1222 set { m_sitTargetPosition = value; }
1223 } 1223 }
1224 1224