diff options
| author | Melanie | 2010-01-03 22:02:36 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-03 22:02:36 +0000 |
| commit | 1121919b57e1495d0357d59e010a865b91757bfb (patch) | |
| tree | 9843d9a5176ed77ecd5f877e617493c35d357bb7 /OpenSim | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-1121919b57e1495d0357d59e010a865b91757bfb.zip opensim-SC-1121919b57e1495d0357d59e010a865b91757bfb.tar.gz opensim-SC-1121919b57e1495d0357d59e010a865b91757bfb.tar.bz2 opensim-SC-1121919b57e1495d0357d59e010a865b91757bfb.tar.xz | |
Solve conflict
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index eda3d60..a14e3ad 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2910,13 +2910,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2910 | SetText(text); | 2910 | SetText(text); |
| 2911 | } | 2911 | } |
| 2912 | 2912 | ||
| 2913 | public void StopLookAt() | ||
| 2914 | { | ||
| 2915 | m_parentGroup.stopLookAt(); | ||
| 2916 | |||
| 2917 | m_parentGroup.ScheduleGroupForTerseUpdate(); | ||
| 2918 | } | ||
| 2919 | |||
| 2920 | public void StopMoveToTarget() | 2913 | public void StopMoveToTarget() |
| 2921 | { | 2914 | { |
| 2922 | m_parentGroup.stopMoveToTarget(); | 2915 | m_parentGroup.stopMoveToTarget(); |