diff options
| author | Robert Adams | 2014-09-21 07:11:00 -0700 |
|---|---|---|
| committer | Robert Adams | 2014-09-21 07:11:00 -0700 |
| commit | 2ed3a918bd88ad427899e3fdfe65afca7aad95e8 (patch) | |
| tree | f49bce49520a5632f147acc75f1dcdf7d4611861 /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
| parent | Merge branch 'master' into bullet-2.82 (diff) | |
| parent | This fixes the Scene thread renaming issue (diff) | |
| download | opensim-SC-2ed3a918bd88ad427899e3fdfe65afca7aad95e8.zip opensim-SC-2ed3a918bd88ad427899e3fdfe65afca7aad95e8.tar.gz opensim-SC-2ed3a918bd88ad427899e3fdfe65afca7aad95e8.tar.bz2 opensim-SC-2ed3a918bd88ad427899e3fdfe65afca7aad95e8.tar.xz | |
Merge branch 'master' into bullet-2.82
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')
| -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, |