diff options
| author | Justin Clark-Casey (justincc) | 2012-02-16 00:15:39 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-16 00:22:39 +0000 |
| commit | c906128191a6801df46d5542c441ef37c5c456a9 (patch) | |
| tree | 148519a768001b58aa7c4013257753ba6909f0e3 /OpenSim/Region/OptionalModules/World | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c906128191a6801df46d5542c441ef37c5c456a9.zip opensim-SC_OLD-c906128191a6801df46d5542c441ef37c5c456a9.tar.gz opensim-SC_OLD-c906128191a6801df46d5542c441ef37c5c456a9.tar.bz2 opensim-SC_OLD-c906128191a6801df46d5542c441ef37c5c456a9.tar.xz | |
Fix some logic mistakes where firstly osNpcCreate() without options was creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect.
Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -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; |