Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge

author: Melanie 2011-10-11 22:42:18 +0100
committer: Melanie 2011-10-11 22:42:18 +0100
commit: 652c59c0a9e7ac16127f0358e91fd216576c0ad0 (patch)
tree: e967460e6e83aa88bd49865af312b1b5738507fd /OpenSim/Region/OptionalModules/Agent
parent: Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge (diff)
parent: Reinstate option to land an npc when it reaches a target. (diff)
download: opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.zip
opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.gz
opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.bz2
opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 00b1c1e..c92f121 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -806,7 +806,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        public event ScriptReset OnScriptReset;
        public event GetScriptRunning OnGetScriptRunning;
        public event SetScriptRunning OnSetScriptRunning;
-        public event Action<Vector3, bool> OnAutoPilotGo;
+        public event Action<Vector3, bool, bool> OnAutoPilotGo;
        public event TerrainUnacked OnUnackedTerrain;
        public event ActivateGesture OnActivateGesture;
        public event DeactivateGesture OnDeactivateGesture;
author	Melanie	2011-10-11 22:42:18 +0100
committer	Melanie	2011-10-11 22:42:18 +0100
commit	652c59c0a9e7ac16127f0358e91fd216576c0ad0 (patch)
tree	e967460e6e83aa88bd49865af312b1b5738507fd /OpenSim/Region/OptionalModules/Agent
parent	Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge (diff)
parent	Reinstate option to land an npc when it reaches a target. (diff)
download	opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.zip opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.gz opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.bz2 opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 00b1c1e..c92f121 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -806,7 +806,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
806	public event ScriptReset OnScriptReset;	806	public event ScriptReset OnScriptReset;
807	public event GetScriptRunning OnGetScriptRunning;	807	public event GetScriptRunning OnGetScriptRunning;
808	public event SetScriptRunning OnSetScriptRunning;	808	public event SetScriptRunning OnSetScriptRunning;
809	public event Action<Vector3, bool> OnAutoPilotGo;	809	public event Action<Vector3, bool, bool> OnAutoPilotGo;
810	public event TerrainUnacked OnUnackedTerrain;	810	public event TerrainUnacked OnUnackedTerrain;
811	public event ActivateGesture OnActivateGesture;	811	public event ActivateGesture OnActivateGesture;
812	public event DeactivateGesture OnDeactivateGesture;	812	public event DeactivateGesture OnDeactivateGesture;