diff options
| author | Justin Clark-Casey (justincc) | 2014-09-12 23:37:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-09-12 23:37:44 +0100 |
| commit | 2d3072f053f172a1c75c98151a960b951a7a20b1 (patch) | |
| tree | f9c7151984ed47ad8eac25a72f7bac3fa6ea22ae /OpenSim/Region/OptionalModules | |
| parent | Add cinderblocks and bobshaffer2 to contributors. (diff) | |
| download | opensim-SC_OLD-2d3072f053f172a1c75c98151a960b951a7a20b1.zip opensim-SC_OLD-2d3072f053f172a1c75c98151a960b951a7a20b1.tar.gz opensim-SC_OLD-2d3072f053f172a1c75c98151a960b951a7a20b1.tar.bz2 opensim-SC_OLD-2d3072f053f172a1c75c98151a960b951a7a20b1.tar.xz | |
When osNpcMoveToTarget() is called for a sitting avatar then silently do nothing rather than throwing an error.
Resolves http://opensimulator.org/mantis/view.php?id=7311
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 03c6265..95e59ab 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
| @@ -234,6 +234,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 234 | ScenePresence sp; | 234 | ScenePresence sp; |
| 235 | if (scene.TryGetScenePresence(agentID, out sp)) | 235 | if (scene.TryGetScenePresence(agentID, out sp)) |
| 236 | { | 236 | { |
| 237 | if (sp.IsSatOnObject || sp.SitGround) | ||
| 238 | return false; | ||
| 239 | |||
| 237 | // m_log.DebugFormat( | 240 | // m_log.DebugFormat( |
| 238 | // "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}", | 241 | // "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}", |
| 239 | // sp.Name, pos, scene.RegionInfo.RegionName, | 242 | // sp.Name, pos, scene.RegionInfo.RegionName, |