diff options
| author | Robert Adams | 2013-11-24 07:23:12 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-24 07:23:12 -0800 |
| commit | 3193bcaae1cbe86d22c4ade5c79d5e25d11a59da (patch) | |
| tree | c96b96a7302f5323df63f6255e528de68ab67c6f /OpenSim/Region/Application | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
| download | opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.zip opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.gz opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.bz2 opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index e241274..676a940 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -766,7 +766,7 @@ namespace OpenSim | |||
| 766 | foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name)) | 766 | foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name)) |
| 767 | MainConsole.Instance.OutputFormat("New Region Module (Shared): {0}", module.Name); | 767 | MainConsole.Instance.OutputFormat("New Region Module (Shared): {0}", module.Name); |
| 768 | 768 | ||
| 769 | foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name)) | 769 | foreach (IRegionModuleBase module in nonSharedModules.OrderBy(m => m.Name)) |
| 770 | MainConsole.Instance.OutputFormat("New Region Module (Non-Shared): {0}", module.Name); | 770 | MainConsole.Instance.OutputFormat("New Region Module (Non-Shared): {0}", module.Name); |
| 771 | } | 771 | } |
| 772 | ); | 772 | ); |