diff options
| author | justincc | 2010-12-15 00:35:36 +0000 |
|---|---|---|
| committer | justincc | 2010-12-15 00:35:36 +0000 |
| commit | b643661938881af6fc782d39e52040ed6d16f03f (patch) | |
| tree | 162e0667718b2f68e5f4e90cd10f30e6fa374cbb /OpenSim/Tests/Common/Setup | |
| parent | replace ode.dll with one built without asserts turned on (diff) | |
| parent | fix mistake in last change of local.include (diff) | |
| download | opensim-SC_OLD-b643661938881af6fc782d39e52040ed6d16f03f.zip opensim-SC_OLD-b643661938881af6fc782d39e52040ed6d16f03f.tar.gz opensim-SC_OLD-b643661938881af6fc782d39e52040ed6d16f03f.tar.bz2 opensim-SC_OLD-b643661938881af6fc782d39e52040ed6d16f03f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Common/Setup')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 9d7733e..8b16496 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -424,9 +424,12 @@ namespace OpenSim.Tests.Common.Setup | |||
| 424 | foreach (IRegionModuleBase module in newModules) | 424 | foreach (IRegionModuleBase module in newModules) |
| 425 | { | 425 | { |
| 426 | module.AddRegion(scene); | 426 | module.AddRegion(scene); |
| 427 | module.RegionLoaded(scene); | ||
| 428 | scene.AddRegionModule(module.Name, module); | 427 | scene.AddRegionModule(module.Name, module); |
| 429 | } | 428 | } |
| 429 | |||
| 430 | // RegionLoaded is fired after all modules have been appropriately added to all scenes | ||
| 431 | foreach (IRegionModuleBase module in newModules) | ||
| 432 | module.RegionLoaded(scene); | ||
| 430 | 433 | ||
| 431 | scene.SetModuleInterfaces(); | 434 | scene.SetModuleInterfaces(); |
| 432 | } | 435 | } |