aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2011-11-05 11:05:32 +0000
committerMelanie2011-11-05 11:05:32 +0000
commit2cf6172689fd67d969c368fe397700ded23572fd (patch)
tree252883c9250264cc914a8e41935e47a03ae50fb1 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'master' into bigmerge (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-2cf6172689fd67d969c368fe397700ded23572fd.zip
opensim-SC-2cf6172689fd67d969c368fe397700ded23572fd.tar.gz
opensim-SC-2cf6172689fd67d969c368fe397700ded23572fd.tar.bz2
opensim-SC-2cf6172689fd67d969c368fe397700ded23572fd.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c8f28c7..e4bee0c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1129,13 +1129,21 @@ namespace OpenSim.Region.Framework.Scenes
1129 public Quaternion SitTargetOrientation 1129 public Quaternion SitTargetOrientation
1130 { 1130 {
1131 get { return m_sitTargetOrientation; } 1131 get { return m_sitTargetOrientation; }
1132 set { m_sitTargetOrientation = value; } 1132 set
1133 {
1134 m_sitTargetOrientation = value;
1135// m_log.DebugFormat("[SCENE OBJECT PART]: Set sit target orientation {0} for {1} {2}", m_sitTargetOrientation, Name, LocalId);
1136 }
1133 } 1137 }
1134 1138
1135 public Vector3 SitTargetPosition 1139 public Vector3 SitTargetPosition
1136 { 1140 {
1137 get { return m_sitTargetPosition; } 1141 get { return m_sitTargetPosition; }
1138 set { m_sitTargetPosition = value; } 1142 set
1143 {
1144 m_sitTargetPosition = value;
1145// m_log.DebugFormat("[SCENE OBJECT PART]: Set sit target position to {0} for {1} {2}", m_sitTargetPosition, Name, LocalId);
1146 }
1139 } 1147 }
1140 1148
1141 // This sort of sucks, but I'm adding these in to make some of 1149 // This sort of sucks, but I'm adding these in to make some of