diff options
Merge branch 'master' into newmultiattach
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 4075edb..11dd052 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -159,6 +159,7 @@ namespace OpenSim | |||
| 159 | 159 | ||
| 160 | MainConsole.Instance = m_console; | 160 | MainConsole.Instance = m_console; |
| 161 | 161 | ||
| 162 | LogEnvironmentInformation(); | ||
| 162 | RegisterCommonAppenders(Config.Configs["Startup"]); | 163 | RegisterCommonAppenders(Config.Configs["Startup"]); |
| 163 | RegisterConsoleCommands(); | 164 | RegisterConsoleCommands(); |
| 164 | 165 | ||