diff options
| author | Melanie | 2011-10-12 00:10:15 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-12 00:10:15 +0200 |
| commit | 1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch) | |
| tree | 97fa9c758f429d5dee64234e442f2c83cd1b9994 /OpenSim/Tests/Common/Mock | |
| parent | Merge branch 'careminster-presence-refactor' into bigmerge (diff) | |
| parent | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff) | |
| download | opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.zip opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.gz opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.bz2 opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 014f7f6..b4f521f 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -234,7 +234,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 234 | public event ScriptReset OnScriptReset; | 234 | public event ScriptReset OnScriptReset; |
| 235 | public event GetScriptRunning OnGetScriptRunning; | 235 | public event GetScriptRunning OnGetScriptRunning; |
| 236 | public event SetScriptRunning OnSetScriptRunning; | 236 | public event SetScriptRunning OnSetScriptRunning; |
| 237 | public event Action<Vector3, bool> OnAutoPilotGo; | 237 | public event Action<Vector3, bool, bool> OnAutoPilotGo; |
| 238 | 238 | ||
| 239 | public event TerrainUnacked OnUnackedTerrain; | 239 | public event TerrainUnacked OnUnackedTerrain; |
| 240 | 240 | ||