diff options
author | BlueWall | 2012-01-20 23:54:29 -0500 |
---|---|---|
committer | BlueWall | 2012-01-20 23:54:29 -0500 |
commit | 590f707c425bff6896839d1bf024b4dd83b6d078 (patch) | |
tree | 31eeb5fc8ebb68fd28699c99a03aa6854f1fc5a3 /OpenSim/Tests | |
parent | Telehub Support: (diff) | |
parent | Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collid... (diff) | |
download | opensim-SC-590f707c425bff6896839d1bf024b4dd83b6d078.zip opensim-SC-590f707c425bff6896839d1bf024b4dd83b6d078.tar.gz opensim-SC-590f707c425bff6896839d1bf024b4dd83b6d078.tar.bz2 opensim-SC-590f707c425bff6896839d1bf024b4dd83b6d078.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 8a71dfd..ab89fe0 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -60,6 +60,7 @@ namespace OpenSim.Tests.Common.Mock | |||
60 | 60 | ||
61 | public List<ImageDataPacket> SentImageDataPackets { get; private set; } | 61 | public List<ImageDataPacket> SentImageDataPackets { get; private set; } |
62 | public List<ImagePacketPacket> SentImagePacketPackets { get; private set; } | 62 | public List<ImagePacketPacket> SentImagePacketPackets { get; private set; } |
63 | public List<ImageNotInDatabasePacket> SentImageNotInDatabasePackets { get; private set; } | ||
63 | 64 | ||
64 | // disable warning: public events, part of the public API | 65 | // disable warning: public events, part of the public API |
65 | #pragma warning disable 67 | 66 | #pragma warning disable 67 |
@@ -456,6 +457,7 @@ namespace OpenSim.Tests.Common.Mock | |||
456 | 457 | ||
457 | SentImageDataPackets = new List<ImageDataPacket>(); | 458 | SentImageDataPackets = new List<ImageDataPacket>(); |
458 | SentImagePacketPackets = new List<ImagePacketPacket>(); | 459 | SentImagePacketPackets = new List<ImagePacketPacket>(); |
460 | SentImageNotInDatabasePackets = new List<ImageNotInDatabasePacket>(); | ||
459 | } | 461 | } |
460 | 462 | ||
461 | /// <summary> | 463 | /// <summary> |
@@ -823,6 +825,10 @@ namespace OpenSim.Tests.Common.Mock | |||
823 | 825 | ||
824 | public void SendImageNotFound(UUID imageid) | 826 | public void SendImageNotFound(UUID imageid) |
825 | { | 827 | { |
828 | ImageNotInDatabasePacket p = new ImageNotInDatabasePacket(); | ||
829 | p.ImageID.ID = imageid; | ||
830 | |||
831 | SentImageNotInDatabasePackets.Add(p); | ||
826 | } | 832 | } |
827 | 833 | ||
828 | public void SendShutdownConnectionNotice() | 834 | public void SendShutdownConnectionNotice() |