diff options
| author | Melanie | 2012-07-20 09:35:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-20 09:35:22 +0100 |
| commit | df866fd300b94e43326e0b8e194055b5c6cf2afe (patch) | |
| tree | f84db3b1e03d14488eedb078546c3d174ff8857c /OpenSim/Tests | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.zip opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.gz opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.bz2 opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.xz | |
Merge branch 'avination' into careminster
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 e254dd8..6add130 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -732,7 +732,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 732 | { | 732 | { |
| 733 | } | 733 | } |
| 734 | 734 | ||
| 735 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) | 735 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
| 736 | { | 736 | { |
| 737 | } | 737 | } |
| 738 | 738 | ||