diff options
| author | Melanie Thielker | 2014-08-20 04:39:48 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-08-20 04:39:48 +0200 |
| commit | 24b4f6ad7b9e9b54b3efb80aec462fa03e226c32 (patch) | |
| tree | 3128c12ea30a35b30caaf598a8a023c5987d279d /OpenSim/Tests | |
| parent | Expect a missing directory, the asset cache is shared. Prevent spew if (diff) | |
| parent | also send attachment pre-kills on crossings (diff) | |
| download | opensim-SC-24b4f6ad7b9e9b54b3efb80aec462fa03e226c32.zip opensim-SC-24b4f6ad7b9e9b54b3efb80aec462fa03e226c32.tar.gz opensim-SC-24b4f6ad7b9e9b54b3efb80aec462fa03e226c32.tar.bz2 opensim-SC-24b4f6ad7b9e9b54b3efb80aec462fa03e226c32.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 52e0134..f3eaed3 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -379,6 +379,8 @@ namespace OpenSim.Tests.Common.Mock | |||
| 379 | get { return FirstName + " " + LastName; } | 379 | get { return FirstName + " " + LastName; } |
| 380 | } | 380 | } |
| 381 | 381 | ||
| 382 | public int PingTimeMS { get { return 0; } } | ||
| 383 | |||
| 382 | public bool IsActive | 384 | public bool IsActive |
| 383 | { | 385 | { |
| 384 | get { return true; } | 386 | get { return true; } |