diff options
| author | Melanie | 2013-07-24 04:45:07 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-24 04:45:07 +0100 |
| commit | e82d4154a2e348e4a38f01cb1877878c94569bba (patch) | |
| tree | 7b27e6d30d04f6089fd17d5779cfb0a81e50d508 /OpenSim/Tests | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what... (diff) | |
| download | opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.zip opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.gz opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.bz2 opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 6528d9a..df8cf27 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -107,6 +107,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 107 | public event Action<IClientAPI, bool> OnCompleteMovementToRegion; | 107 | public event Action<IClientAPI, bool> OnCompleteMovementToRegion; |
| 108 | public event UpdateAgent OnPreAgentUpdate; | 108 | public event UpdateAgent OnPreAgentUpdate; |
| 109 | public event UpdateAgent OnAgentUpdate; | 109 | public event UpdateAgent OnAgentUpdate; |
| 110 | public event UpdateAgent OnAgentCameraUpdate; | ||
| 110 | public event AgentRequestSit OnAgentRequestSit; | 111 | public event AgentRequestSit OnAgentRequestSit; |
| 111 | public event AgentSit OnAgentSit; | 112 | public event AgentSit OnAgentSit; |
| 112 | public event AvatarPickerRequest OnAvatarPickerRequest; | 113 | public event AvatarPickerRequest OnAvatarPickerRequest; |
| @@ -1266,7 +1267,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 1266 | { | 1267 | { |
| 1267 | } | 1268 | } |
| 1268 | 1269 | ||
| 1269 | public void StopFlying(ISceneEntity presence) | 1270 | public void SendAgentTerseUpdate(ISceneEntity presence) |
| 1270 | { | 1271 | { |
| 1271 | } | 1272 | } |
| 1272 | 1273 | ||