diff options
| author | Robert Adams | 2013-05-01 12:08:12 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-01 12:08:12 -0700 |
| commit | fca4e4ec7c044921ba602862c5a42900f819015a (patch) | |
| tree | f3a1e0b09b7a454009437dd9b1015891a85eadb8 /OpenSim/Region/ClientStack/Linden/UDP | |
| parent | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working... (diff) | |
| parent | Add in-code exaplanation for the change in cancellation signalling in STP 2.2... (diff) | |
| download | opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.zip opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.tar.gz opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.tar.bz2 opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.tar.xz | |
Merge branch 'master' into bulletsim4
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs index 7d9f581..a0e0078 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | |||
| @@ -75,6 +75,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
| 75 | [SetUp] | 75 | [SetUp] |
| 76 | public void SetUp() | 76 | public void SetUp() |
| 77 | { | 77 | { |
| 78 | base.SetUp(); | ||
| 79 | |||
| 78 | UUID userId = TestHelpers.ParseTail(0x3); | 80 | UUID userId = TestHelpers.ParseTail(0x3); |
| 79 | 81 | ||
| 80 | J2KDecoderModule j2kdm = new J2KDecoderModule(); | 82 | J2KDecoderModule j2kdm = new J2KDecoderModule(); |