diff options
author | Melanie | 2010-10-29 20:24:14 +0100 |
---|---|---|
committer | Melanie | 2010-10-29 20:24:14 +0100 |
commit | 05d2302c62949f27f8f4314dd649965c7f20aaba (patch) | |
tree | 672d0d8327d521dfefb44dc5d7d1d49ed8642ee0 /OpenSim/Tests | |
parent | Revert "Preliminary work on appearance layers. No user functionality yet." (diff) | |
parent | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... (diff) | |
download | opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.zip opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.gz opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.bz2 opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.xz |
Merge branch 'dev-appearance'
Diffstat (limited to 'OpenSim/Tests')
-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 e46f9b7..b2c8b35 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Tests.Common.Mock | |||
94 | 94 | ||
95 | public event DeRezObject OnDeRezObject; | 95 | public event DeRezObject OnDeRezObject; |
96 | public event Action<IClientAPI> OnRegionHandShakeReply; | 96 | public event Action<IClientAPI> OnRegionHandShakeReply; |
97 | public event GenericCall2 OnRequestWearables; | 97 | public event GenericCall1 OnRequestWearables; |
98 | public event GenericCall1 OnCompleteMovementToRegion; | 98 | public event GenericCall1 OnCompleteMovementToRegion; |
99 | public event UpdateAgent OnPreAgentUpdate; | 99 | public event UpdateAgent OnPreAgentUpdate; |
100 | public event UpdateAgent OnAgentUpdate; | 100 | public event UpdateAgent OnAgentUpdate; |