diff options
| author | Melanie | 2013-04-30 23:45:38 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-30 23:45:38 +0100 |
| commit | b89d18e6f4a1099fe031ebf10776a752826604b9 (patch) | |
| tree | b964e6b167e156dc2adeddeb733d93eac342e9c0 /OpenSim/Region/ClientStack/Linden | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fix error messages created while an avatar has no initial (diff) | |
| download | opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.zip opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.gz opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.bz2 opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -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(); |