diff options
author | Melanie | 2013-06-23 01:59:57 +0100 |
---|---|---|
committer | Melanie | 2013-06-23 01:59:57 +0100 |
commit | f70357eaa355b8c152f3d793d0fceafa14df5fd4 (patch) | |
tree | ffda32c340bd7f6d69652e9d9a959c7396f42a2f /OpenSim/Region/Application/OpenSimBase.cs | |
parent | Merge branch 'avination-current' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.zip opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.gz opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.bz2 opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 0ed85b8..11cacac 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -246,10 +246,7 @@ namespace OpenSim | |||
246 | } | 246 | } |
247 | 247 | ||
248 | if (m_console != null) | 248 | if (m_console != null) |
249 | { | ||
250 | StatsManager.RegisterConsoleCommands(m_console); | ||
251 | AddPluginCommands(m_console); | 249 | AddPluginCommands(m_console); |
252 | } | ||
253 | } | 250 | } |
254 | 251 | ||
255 | protected virtual void AddPluginCommands(ICommandConsole console) | 252 | protected virtual void AddPluginCommands(ICommandConsole console) |
@@ -964,7 +961,7 @@ namespace OpenSim | |||
964 | /// <summary> | 961 | /// <summary> |
965 | /// Performs any last-minute sanity checking and shuts down the region server | 962 | /// Performs any last-minute sanity checking and shuts down the region server |
966 | /// </summary> | 963 | /// </summary> |
967 | public override void ShutdownSpecific() | 964 | protected override void ShutdownSpecific() |
968 | { | 965 | { |
969 | if (proxyUrl.Length > 0) | 966 | if (proxyUrl.Length > 0) |
970 | { | 967 | { |
@@ -984,6 +981,8 @@ namespace OpenSim | |||
984 | { | 981 | { |
985 | m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e); | 982 | m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e); |
986 | } | 983 | } |
984 | |||
985 | base.ShutdownSpecific(); | ||
987 | } | 986 | } |
988 | 987 | ||
989 | /// <summary> | 988 | /// <summary> |