diff options
author | Justin Clark-Casey (justincc) | 2011-08-02 23:41:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-02 23:41:12 +0100 |
commit | c122489e0947300753281e88771b7a74d49869c7 (patch) | |
tree | c8b0f67e85f883cd1e9a1ff3ff411c7eca08e64f /OpenSim/Region/OptionalModules/World/NPC | |
parent | If GetRegionByName can't match something in the local db, then search the hyp... (diff) | |
download | opensim-SC_OLD-c122489e0947300753281e88771b7a74d49869c7.zip opensim-SC_OLD-c122489e0947300753281e88771b7a74d49869c7.tar.gz opensim-SC_OLD-c122489e0947300753281e88771b7a74d49869c7.tar.bz2 opensim-SC_OLD-c122489e0947300753281e88771b7a74d49869c7.tar.xz |
Partially fix autopilot/go here
This now works again except that it requires a click or avatar mvmt to get going
This is because the ScenePresence.HandleAgentUpdate() method doesn't trigger until the client does something significant, at which point autopilot takes over.
Even clicking is enough to trigger.
This will be improved presently.
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 3afcc8d..e87993a 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -99,6 +99,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
99 | { | 99 | { |
100 | 100 | ||
101 | } | 101 | } |
102 | |||
102 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, | 103 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, |
103 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) | 104 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) |
104 | { | 105 | { |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 6286dc8..8cb8318 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -140,7 +140,16 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
140 | { | 140 | { |
141 | ScenePresence sp; | 141 | ScenePresence sp; |
142 | scene.TryGetScenePresence(agentID, out sp); | 142 | scene.TryGetScenePresence(agentID, out sp); |
143 | sp.DoAutoPilot(0, pos, m_avatars[agentID]); | 143 | |
144 | // m_log.DebugFormat( | ||
145 | // "[NPC MODULE]: Moving {0} to {1} in {2}", sp.Name, pos, scene.RegionInfo.RegionName); | ||
146 | // | ||
147 | // List<string> targetArgs = new List<string>(); | ||
148 | // targetArgs.Add(pos.X); | ||
149 | // targetArgs.Add(pos.Y); | ||
150 | // targetArgs.Add(pos.Z); | ||
151 | // sp.DoMoveToPosition(null, "NPC", targetArgs); | ||
152 | // sp.DoMoveToPosition(0, pos, m_avatars[agentID]); | ||
144 | } | 153 | } |
145 | } | 154 | } |
146 | } | 155 | } |