diff options
| author | Mic Bowman | 2011-08-05 11:13:02 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-05 11:13:02 -0700 |
| commit | c3f579046c4de7a5a65e71e4c02958425fd7998a (patch) | |
| tree | b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/Region/OptionalModules/Agent | |
| parent | BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff) | |
| parent | remove the largely unused copy/pasted HandleAgentRequestSit() method (diff) | |
| download | opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 88db20e..a0c1ab1 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 UpdateVector OnAutoPilotGo; | 809 | public event Action<Vector3> 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; |
| @@ -1678,7 +1678,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1678 | { | 1678 | { |
| 1679 | } | 1679 | } |
| 1680 | 1680 | ||
| 1681 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | 1681 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId) |
| 1682 | { | 1682 | { |
| 1683 | } | 1683 | } |
| 1684 | 1684 | ||