diff options
| author | Melanie | 2010-03-30 21:34:27 +0100 |
|---|---|---|
| committer | Melanie | 2010-03-30 21:34:27 +0100 |
| commit | 5693870fe26fae35a28f2d5103780434f4f40e57 (patch) | |
| tree | 0e070fb6f11ab8763ac4f1f9a851a0061101d4d6 /OpenSim/Region/OptionalModules/World | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | minor: commented out code removal (diff) | |
| download | opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.zip opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.gz opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.bz2 opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -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 6e742f1..ab0be77 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
| @@ -110,7 +110,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 110 | if (m_avatars.ContainsKey(agentID)) | 110 | if (m_avatars.ContainsKey(agentID)) |
| 111 | { | 111 | { |
| 112 | ScenePresence sp; | 112 | ScenePresence sp; |
| 113 | scene.TryGetAvatar(agentID, out sp); | 113 | scene.TryGetScenePresence(agentID, out sp); |
| 114 | sp.DoAutoPilot(0, pos, m_avatars[agentID]); | 114 | sp.DoAutoPilot(0, pos, m_avatars[agentID]); |
| 115 | } | 115 | } |
| 116 | } | 116 | } |
| @@ -165,7 +165,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 165 | p_scene.AddNewClient(npcAvatar); | 165 | p_scene.AddNewClient(npcAvatar); |
| 166 | 166 | ||
| 167 | ScenePresence sp; | 167 | ScenePresence sp; |
| 168 | if (p_scene.TryGetAvatar(npcAvatar.AgentId, out sp)) | 168 | if (p_scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) |
| 169 | { | 169 | { |
| 170 | AvatarAppearance x = GetAppearance(p_cloneAppearanceFrom, p_scene); | 170 | AvatarAppearance x = GetAppearance(p_cloneAppearanceFrom, p_scene); |
| 171 | 171 | ||