diff options
| author | Melanie | 2013-11-23 19:13:22 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-23 19:13:22 +0000 |
| commit | 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch) | |
| tree | a833014a1fedd774e7a9a01cd89a7edddb4210ba /OpenSim/Region/Application/OpenSim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
| download | opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
| -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 20f6af5..739bcc2 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 | ); |