diff options
| author | Melanie | 2009-10-19 21:58:51 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-19 21:58:51 +0100 |
| commit | ffd59868f5e2d797160b1bbfc13f3b4bac717b36 (patch) | |
| tree | fb807a129a6e449ac17dadce15d7b27268c92c3f /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Minor formatting cleanup. (diff) | |
| download | opensim-SC_OLD-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.zip opensim-SC_OLD-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.gz opensim-SC_OLD-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.bz2 opensim-SC_OLD-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 845a9fe..0d93ff7 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -246,7 +246,7 @@ namespace OpenSim.Framework.Servers | |||
| 246 | foreach (ProcessThread t in threads) | 246 | foreach (ProcessThread t in threads) |
| 247 | { | 247 | { |
| 248 | sb.Append("ID: " + t.Id + ", TotalProcessorTime: " + t.TotalProcessorTime + ", TimeRunning: " + | 248 | sb.Append("ID: " + t.Id + ", TotalProcessorTime: " + t.TotalProcessorTime + ", TimeRunning: " + |
| 249 | (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState ); | 249 | (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState); |
| 250 | if (t.ThreadState == System.Diagnostics.ThreadState.Wait) | 250 | if (t.ThreadState == System.Diagnostics.ThreadState.Wait) |
| 251 | sb.Append(", Reason: " + t.WaitReason + Environment.NewLine); | 251 | sb.Append(", Reason: " + t.WaitReason + Environment.NewLine); |
| 252 | else | 252 | else |