Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index f9c1ac2..db0a7fc 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -385,6 +385,11 @@ namespace OpenSim.Tests.Common
 
             foreach (IRegionModuleBase module in newModules)
             {
+                if (module is ISharedRegionModule) ((ISharedRegionModule)module).PostInitialise();
+            }
+
+            foreach (IRegionModuleBase module in newModules)
+            {
                 foreach (Scene scene in scenes)
                 {
                     module.AddRegion(scene);
@@ -392,11 +397,6 @@ namespace OpenSim.Tests.Common
                 }
             }
 
-            foreach (IRegionModuleBase module in newModules)
-            {
-                if (module is ISharedRegionModule) ((ISharedRegionModule)module).PostInitialise();
-            }
-
             // RegionLoaded is fired after all modules have been appropriately added to all scenes
             foreach (IRegionModuleBase module in newModules)
                 foreach (Scene scene in scenes)