diff options
| author | Melanie | 2010-12-04 00:09:32 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-04 00:09:32 +0000 |
| commit | 24af7b8384d8236ad049c5432dfb574cb3b59dfe (patch) | |
| tree | 2b9949652e0f4a9f4cf62e1b8a080a9aa37cfb71 /OpenSim/Region/Application | |
| parent | When linking something, immediately persist the linked set. (diff) | |
| parent | Various bug fixes for appearance handling: more aggressive reset of textures ... (diff) | |
| download | opensim-SC-24af7b8384d8236ad049c5432dfb574cb3b59dfe.zip opensim-SC-24af7b8384d8236ad049c5432dfb574cb3b59dfe.tar.gz opensim-SC-24af7b8384d8236ad049c5432dfb574cb3b59dfe.tar.bz2 opensim-SC-24af7b8384d8236ad049c5432dfb574cb3b59dfe.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index c5ee385..06b4aea 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -361,13 +361,13 @@ namespace OpenSim | |||
| 361 | m_moduleLoader.InitialiseSharedModules(scene); | 361 | m_moduleLoader.InitialiseSharedModules(scene); |
| 362 | 362 | ||
| 363 | // Use this in the future, the line above will be deprecated soon | 363 | // Use this in the future, the line above will be deprecated soon |
| 364 | m_log.Info("[MODULES]: Loading Region's modules (new style)"); | 364 | m_log.Info("[REGIONMODULE]: Loading Region's modules (new style)"); |
| 365 | IRegionModulesController controller; | 365 | IRegionModulesController controller; |
| 366 | if (ApplicationRegistry.TryGet(out controller)) | 366 | if (ApplicationRegistry.TryGet(out controller)) |
| 367 | { | 367 | { |
| 368 | controller.AddRegionToModules(scene); | 368 | controller.AddRegionToModules(scene); |
| 369 | } | 369 | } |
| 370 | else m_log.Error("[MODULES]: The new RegionModulesController is missing..."); | 370 | else m_log.Error("[REGIONMODULE]: The new RegionModulesController is missing..."); |
| 371 | 371 | ||
| 372 | if (m_securePermissionsLoading) | 372 | if (m_securePermissionsLoading) |
| 373 | { | 373 | { |