diff options
author | Dan Lake | 2010-03-19 05:58:34 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-19 15:16:44 -0700 |
commit | 62e0b53ca4697a852ee1e36e86da6a32e93bd55e (patch) | |
tree | aacaa4c84a0b7e61784909ca76fb1528ca06938b /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
parent | Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetA... (diff) | |
download | opensim-SC-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.zip opensim-SC-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.tar.gz opensim-SC-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.tar.bz2 opensim-SC-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.tar.xz |
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
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 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 | ||