diff options
| author | Melanie | 2012-04-23 20:44:41 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-23 20:44:41 +0100 |
| commit | e9037098475202c02d3327d2dff877d0fd108c93 (patch) | |
| tree | cd52623e1f12ffe0ca98609f270d27d30afc35af /OpenSim/Region/Framework/Scenes/Tests | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mantis 5977 Corrections to llRegionSayTo (diff) | |
| download | opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.zip opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.gz opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.bz2 opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs index 882031c..360566d 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs | |||
| @@ -62,6 +62,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 62 | { | 62 | { |
| 63 | TestHelpers.InMethod(); | 63 | TestHelpers.InMethod(); |
| 64 | 64 | ||
| 65 | m_scene.AddSceneObject(m_so1); | ||
| 66 | |||
| 65 | SceneObjectPart rootPart = m_so1.RootPart; | 67 | SceneObjectPart rootPart = m_so1.RootPart; |
| 66 | Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None)); | 68 | Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None)); |
| 67 | 69 | ||
| @@ -80,6 +82,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 80 | { | 82 | { |
| 81 | TestHelpers.InMethod(); | 83 | TestHelpers.InMethod(); |
| 82 | 84 | ||
| 85 | m_scene.AddSceneObject(m_so1); | ||
| 86 | |||
| 83 | SceneObjectPart rootPart = m_so1.RootPart; | 87 | SceneObjectPart rootPart = m_so1.RootPart; |
| 84 | Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None)); | 88 | Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None)); |
| 85 | 89 | ||