diff options
| author | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
| commit | 4adada6fe48a960850639628c0f90e55c848235f (patch) | |
| tree | 63f616d32f35012fe278a8cdeb9b3e762ecde37a /OpenSim/Tests | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.zip opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.gz opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.bz2 opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index fc9db03..9d7733e 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -556,7 +556,7 @@ namespace OpenSim.Tests.Common.Setup | |||
| 556 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 556 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
| 557 | sogd.Enabled = false; | 557 | sogd.Enabled = false; |
| 558 | 558 | ||
| 559 | scene.DeRezObject(client, part.LocalId, UUID.Zero, action, destinationId); | 559 | scene.DeRezObjects(client, new List<uint>() { part.LocalId }, UUID.Zero, action, destinationId); |
| 560 | sogd.InventoryDeQueueAndDelete(); | 560 | sogd.InventoryDeQueueAndDelete(); |
| 561 | } | 561 | } |
| 562 | } | 562 | } |