diff options
| author | Dan Lake | 2011-09-21 16:24:48 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-09-21 16:24:48 -0700 |
| commit | 28a482a7ee2cebab1aa720477af175d7e26d702e (patch) | |
| tree | 863fb4b43a571da4d1d963b5a1383538e6391ec8 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Commented out new debug statements in ScenePresence (diff) | |
| parent | Reinstate option to land an npc when it reaches a target. (diff) | |
| download | opensim-SC_OLD-28a482a7ee2cebab1aa720477af175d7e26d702e.zip opensim-SC_OLD-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.gz opensim-SC_OLD-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.bz2 opensim-SC_OLD-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index e7f2491..980b01f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1599,7 +1599,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1599 | ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar); | 1599 | ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar); |
| 1600 | if (avatar != null) | 1600 | if (avatar != null) |
| 1601 | { | 1601 | { |
| 1602 | avatar.MoveToTarget(target, false); | 1602 | avatar.MoveToTarget(target, false, false); |
| 1603 | } | 1603 | } |
| 1604 | } | 1604 | } |
| 1605 | else | 1605 | else |