diff options
| author | Talun | 2012-07-03 11:10:09 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-07-06 22:37:19 +0100 |
| commit | 1b1f841c6aaf2453b3aca0eade84855ae658e655 (patch) | |
| tree | 895b5f5bec7f0ae737e74017809e8762c05518b2 /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
| parent | Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from ... (diff) | |
| download | opensim-SC-1b1f841c6aaf2453b3aca0eade84855ae658e655.zip opensim-SC-1b1f841c6aaf2453b3aca0eade84855ae658e655.tar.gz opensim-SC-1b1f841c6aaf2453b3aca0eade84855ae658e655.tar.bz2 opensim-SC-1b1f841c6aaf2453b3aca0eade84855ae658e655.tar.xz | |
Mantis 6063 osNpcTouch.
Allow NPCS to touch obects.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index d3456ab..1e85fb4 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
| @@ -305,6 +305,16 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 305 | return false; | 305 | return false; |
| 306 | } | 306 | } |
| 307 | 307 | ||
| 308 | public bool Touch(UUID agentID, UUID objectID) | ||
| 309 | { | ||
| 310 | lock (m_avatars) | ||
| 311 | { | ||
| 312 | if (m_avatars.ContainsKey(agentID)) | ||
| 313 | return m_avatars[agentID].Touch(objectID); | ||
| 314 | return false; | ||
| 315 | } | ||
| 316 | } | ||
| 317 | |||
| 308 | public UUID GetOwner(UUID agentID) | 318 | public UUID GetOwner(UUID agentID) |
| 309 | { | 319 | { |
| 310 | lock (m_avatars) | 320 | lock (m_avatars) |