aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2010-01-11 02:04:58 +0000
committerMelanie2010-01-11 02:04:58 +0000
commit649d45a2d484f92765699920faf528891aba22a9 (patch)
treea464685ab19c0c6a358e37e87787b1c7ab1bee08 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'master' into careminster (diff)
parentWhitespace cleanup (diff)
downloadopensim-SC_OLD-649d45a2d484f92765699920faf528891aba22a9.zip
opensim-SC_OLD-649d45a2d484f92765699920faf528891aba22a9.tar.gz
opensim-SC_OLD-649d45a2d484f92765699920faf528891aba22a9.tar.bz2
opensim-SC_OLD-649d45a2d484f92765699920faf528891aba22a9.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs34
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 680a544..a7c14cf 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4089,23 +4089,23 @@ namespace OpenSim.Region.Framework.Scenes
4089 { 4089 {
4090 m_parentGroup.unregisterTargetWaypoint(handle); 4090 m_parentGroup.unregisterTargetWaypoint(handle);
4091 } 4091 }
4092 } 4092 }
4093 4093
4094 public int registerRotTargetWaypoint(Quaternion target, float tolerance) 4094 public int registerRotTargetWaypoint(Quaternion target, float tolerance)
4095 { 4095 {
4096 if (m_parentGroup != null) 4096 if (m_parentGroup != null)
4097 { 4097 {
4098 return m_parentGroup.registerRotTargetWaypoint(target, tolerance); 4098 return m_parentGroup.registerRotTargetWaypoint(target, tolerance);
4099 } 4099 }
4100 return 0; 4100 return 0;
4101 } 4101 }
4102 4102
4103 public void unregisterRotTargetWaypoint(int handle) 4103 public void unregisterRotTargetWaypoint(int handle)
4104 { 4104 {
4105 if (m_parentGroup != null) 4105 if (m_parentGroup != null)
4106 { 4106 {
4107 m_parentGroup.unregisterRotTargetWaypoint(handle); 4107 m_parentGroup.unregisterRotTargetWaypoint(handle);
4108 } 4108 }
4109 } 4109 }
4110 4110
4111 public void SetCameraAtOffset(Vector3 v) 4111 public void SetCameraAtOffset(Vector3 v)