diff options
author | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
---|---|---|
committer | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
commit | 140ea04b9d692344d803fc87364fb252561725c3 (patch) | |
tree | d503b7ae17baca374d704b548fc7da512f512388 /OpenSim/Framework/Servers/ServerBase.cs | |
parent | Merge pull request #7 from gamucf/moses.metricsPhase2 (diff) | |
parent | resolve possible nullref when sending appearance packet. Thanks to zadark for... (diff) | |
download | opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.zip opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.tar.gz opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.tar.bz2 opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.tar.xz |
Merging Opensim upstream before generating patch
Diffstat (limited to 'OpenSim/Framework/Servers/ServerBase.cs')
-rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index c22c119..e403ba0 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
@@ -292,11 +292,11 @@ namespace OpenSim.Framework.Servers | |||
292 | + " 3 = full stack trace, including common threads\n", | 292 | + " 3 = full stack trace, including common threads\n", |
293 | HandleDebugThreadpoolLevel); | 293 | HandleDebugThreadpoolLevel); |
294 | 294 | ||
295 | m_console.Commands.AddCommand( | 295 | // m_console.Commands.AddCommand( |
296 | "Debug", false, "show threadpool calls active", | 296 | // "Debug", false, "show threadpool calls active", |
297 | "show threadpool calls active", | 297 | // "show threadpool calls active", |
298 | "Show details about threadpool calls that are still active (currently waiting or in progress)", | 298 | // "Show details about threadpool calls that are still active (currently waiting or in progress)", |
299 | HandleShowThreadpoolCallsActive); | 299 | // HandleShowThreadpoolCallsActive); |
300 | 300 | ||
301 | m_console.Commands.AddCommand( | 301 | m_console.Commands.AddCommand( |
302 | "Debug", false, "show threadpool calls complete", | 302 | "Debug", false, "show threadpool calls complete", |