diff options
| author | Melanie | 2010-01-11 02:01:23 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-11 02:01:23 +0000 |
| commit | 0ae861d7d7055e8765bcc2ff6c592a65a5d6510d (patch) | |
| tree | d3b9c168f3c78fdf5ae9ec19684f4a460bdc5368 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Adds llRotTarget and the events at_rot_target and not_at_rot_target. (diff) | |
| download | opensim-SC-0ae861d7d7055e8765bcc2ff6c592a65a5d6510d.zip opensim-SC-0ae861d7d7055e8765bcc2ff6c592a65a5d6510d.tar.gz opensim-SC-0ae861d7d7055e8765bcc2ff6c592a65a5d6510d.tar.bz2 opensim-SC-0ae861d7d7055e8765bcc2ff6c592a65a5d6510d.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 7906138..680a544 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4089,6 +4089,23 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4089 | { | 4089 | { |
| 4090 | m_parentGroup.unregisterTargetWaypoint(handle); | 4090 | m_parentGroup.unregisterTargetWaypoint(handle); |
| 4091 | } | 4091 | } |
| 4092 | } | ||
| 4093 | |||
| 4094 | public int registerRotTargetWaypoint(Quaternion target, float tolerance) | ||
| 4095 | { | ||
| 4096 | if (m_parentGroup != null) | ||
| 4097 | { | ||
| 4098 | return m_parentGroup.registerRotTargetWaypoint(target, tolerance); | ||
| 4099 | } | ||
| 4100 | return 0; | ||
| 4101 | } | ||
| 4102 | |||
| 4103 | public void unregisterRotTargetWaypoint(int handle) | ||
| 4104 | { | ||
| 4105 | if (m_parentGroup != null) | ||
| 4106 | { | ||
| 4107 | m_parentGroup.unregisterRotTargetWaypoint(handle); | ||
| 4108 | } | ||
| 4092 | } | 4109 | } |
| 4093 | 4110 | ||
| 4094 | public void SetCameraAtOffset(Vector3 v) | 4111 | public void SetCameraAtOffset(Vector3 v) |