diff options
| author | Melanie | 2009-10-15 21:14:13 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-15 21:14:13 +0100 |
| commit | 6deef7d0f3e9657bdc7bc4c41011dba15fea944b (patch) | |
| tree | ffa84d5963afbb5390b132278c95df20b21681d5 /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into h... (diff) | |
| download | opensim-SC-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.zip opensim-SC-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.gz opensim-SC-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.bz2 opensim-SC-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 30a2675..41a6255 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
| @@ -155,7 +155,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 155 | NPCAvatar npcAvatar = new NPCAvatar(p_firstname, p_lastname, p_position, p_scene); | 155 | NPCAvatar npcAvatar = new NPCAvatar(p_firstname, p_lastname, p_position, p_scene); |
| 156 | npcAvatar.CircuitCode = (uint) Util.RandomClass.Next(0, int.MaxValue); | 156 | npcAvatar.CircuitCode = (uint) Util.RandomClass.Next(0, int.MaxValue); |
| 157 | 157 | ||
| 158 | p_scene.ClientManager.Add(npcAvatar.CircuitCode, npcAvatar); | ||
| 159 | p_scene.AddNewClient(npcAvatar); | 158 | p_scene.AddNewClient(npcAvatar); |
| 160 | 159 | ||
| 161 | ScenePresence sp; | 160 | ScenePresence sp; |