diff options
| author | Dan Lake | 2012-02-17 13:51:54 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-02-17 13:51:54 -0800 |
| commit | b313d16493b765c3981ef3d15b8919d376733df2 (patch) | |
| tree | c1111d430dcf7ecbecc3fa82a01e4e9623c1b6bc /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
| parent | Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by A... (diff) | |
| parent | Add new and updated script events (diff) | |
| download | opensim-SC-b313d16493b765c3981ef3d15b8919d376733df2.zip opensim-SC-b313d16493b765c3981ef3d15b8919d376733df2.tar.gz opensim-SC-b313d16493b765c3981ef3d15b8919d376733df2.tar.bz2 opensim-SC-b313d16493b765c3981ef3d15b8919d376733df2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 5359354..2052cdb 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
| @@ -121,8 +121,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 121 | npcAvatar.CircuitCode = (uint)Util.RandomClass.Next(0, int.MaxValue); | 121 | npcAvatar.CircuitCode = (uint)Util.RandomClass.Next(0, int.MaxValue); |
| 122 | 122 | ||
| 123 | m_log.DebugFormat( | 123 | m_log.DebugFormat( |
| 124 | "[NPC MODULE]: Creating NPC {0} {1} {2} at {3} in {4}", | 124 | "[NPC MODULE]: Creating NPC {0} {1} {2}, owner={3}, senseAsAgent={4} at {5} in {6}", |
| 125 | firstname, lastname, npcAvatar.AgentId, position, scene.RegionInfo.RegionName); | 125 | firstname, lastname, npcAvatar.AgentId, owner, senseAsAgent, position, scene.RegionInfo.RegionName); |
| 126 | 126 | ||
| 127 | AgentCircuitData acd = new AgentCircuitData(); | 127 | AgentCircuitData acd = new AgentCircuitData(); |
| 128 | acd.AgentID = npcAvatar.AgentId; | 128 | acd.AgentID = npcAvatar.AgentId; |