diff options
| author | Melanie | 2012-01-14 05:39:56 +0100 |
|---|---|---|
| committer | Melanie | 2012-01-14 05:39:56 +0100 |
| commit | 4cbf8d728e3bc4286463ef0e7cb611b10f594321 (patch) | |
| tree | 71df7e9377882ec9dc915ae01e301a5e34c8294a /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-4cbf8d728e3bc4286463ef0e7cb611b10f594321.zip opensim-SC-4cbf8d728e3bc4286463ef0e7cb611b10f594321.tar.gz opensim-SC-4cbf8d728e3bc4286463ef0e7cb611b10f594321.tar.bz2 opensim-SC-4cbf8d728e3bc4286463ef0e7cb611b10f594321.tar.xz | |
Fix merge
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c9a8832..b232855 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2747,11 +2747,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2747 | 2747 | ||
| 2748 | public void RotLookAt(Quaternion target, float strength, float damping) | 2748 | public void RotLookAt(Quaternion target, float strength, float damping) |
| 2749 | { | 2749 | { |
| 2750 | m_parentGroup.rotLookAt(target, strength, damping); // This calls method in SceneObjectGroup. | ||
| 2751 | } | ||
| 2752 | |||
| 2753 | public void rotLookAt(Quaternion target, float strength, float damping) | ||
| 2754 | { | ||
| 2755 | if (ParentGroup.IsAttachment) | 2750 | if (ParentGroup.IsAttachment) |
| 2756 | { | 2751 | { |
| 2757 | /* | 2752 | /* |