diff options
| author | sacha | 2010-12-04 21:50:48 +0000 |
|---|---|---|
| committer | sacha | 2010-12-04 21:50:48 +0000 |
| commit | 835103af82eb0b8c0916bbbe3c5a981e92e5a47e (patch) | |
| tree | 154f02cada4bf550b7278aef31c42f9ba8da3ef5 /OpenSim/Region/Application | |
| parent | add more detail to the log in case of FORM Timeout (diff) | |
| parent | Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims (diff) | |
| download | opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.zip opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.gz opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.bz2 opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application')
| -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..6a7272d 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("[REGIONMODULES]: 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("[REGIONMODULES]: The new RegionModulesController is missing..."); |
| 371 | 371 | ||
| 372 | if (m_securePermissionsLoading) | 372 | if (m_securePermissionsLoading) |
| 373 | { | 373 | { |