diff options
| author | Robert Adams | 2017-08-14 18:48:10 -0700 |
|---|---|---|
| committer | Robert Adams | 2017-08-14 18:48:10 -0700 |
| commit | 8f3c17189c6b2a11ef769e9fff67ec27e491298b (patch) | |
| tree | d154b230f03af125644caee850bc459083be2b8e /OpenSim/Tests/Permissions/DirectTransferTests.cs | |
| parent | Update BulletSim with corrected collision computations. (diff) | |
| parent | Revert "Let's try giving Common a default constructor instead of the workaround" (diff) | |
| download | opensim-SC-8f3c17189c6b2a11ef769e9fff67ec27e491298b.zip opensim-SC-8f3c17189c6b2a11ef769e9fff67ec27e491298b.tar.gz opensim-SC-8f3c17189c6b2a11ef769e9fff67ec27e491298b.tar.bz2 opensim-SC-8f3c17189c6b2a11ef769e9fff67ec27e491298b.tar.xz | |
Merge branch 'master' into BulletSim2017
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Permissions/DirectTransferTests.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs index c68bbdf..0f251db 100644 --- a/OpenSim/Tests/Permissions/DirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs | |||
| @@ -44,6 +44,13 @@ namespace OpenSim.Tests.Permissions | |||
| 44 | [SetUp] | 44 | [SetUp] |
| 45 | public void SetUp() | 45 | public void SetUp() |
| 46 | { | 46 | { |
| 47 | // In case we're dealing with some older version of nunit | ||
| 48 | if (Common.TheInstance == null) | ||
| 49 | { | ||
| 50 | Common.TheInstance = new Common(); | ||
| 51 | Common.TheInstance.SetUp(); | ||
| 52 | } | ||
| 53 | |||
| 47 | Common.TheInstance.DeleteObjectsFolders(); | 54 | Common.TheInstance.DeleteObjectsFolders(); |
| 48 | } | 55 | } |
| 49 | 56 | ||