diff options
| author | Melanie | 2012-03-20 23:39:02 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-20 23:39:02 +0000 |
| commit | 35c3124c3badfc7c6e3b0ee1957cb827be678650 (patch) | |
| tree | e245c0080da5acc0b9192208d0a421be865ba2cb /OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add prim name to "[MESH]: No recognized physics mesh..." log message (diff) | |
| download | opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.zip opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.gz opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.bz2 opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index 8b8aea5..5c9a77d 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | |||
| @@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 61 | TestHelpers.InMethod(); | 61 | TestHelpers.InMethod(); |
| 62 | 62 | ||
| 63 | Scene scene = SceneHelpers.SetupScene(); | 63 | Scene scene = SceneHelpers.SetupScene(); |
| 64 | scene.Update(); | 64 | scene.Update(1); |
| 65 | 65 | ||
| 66 | Assert.That(scene.Frame, Is.EqualTo(1)); | 66 | Assert.That(scene.Frame, Is.EqualTo(1)); |
| 67 | } | 67 | } |