diff options
| author | Dan Lake | 2012-02-01 16:25:35 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-02-01 16:25:35 -0800 |
| commit | c10193c72b1f029a958f04d2f5d7ee384e693aaa (patch) | |
| tree | 052ec7e973c15b158310511197affad14eb9c64f /OpenSim/Framework/Servers | |
| parent | Trigger event when prims are scheduled for an update. This gives modules earl... (diff) | |
| parent | Small optimization to last commit (diff) | |
| download | opensim-SC-c10193c72b1f029a958f04d2f5d7ee384e693aaa.zip opensim-SC-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.gz opensim-SC-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.bz2 opensim-SC-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers')
| -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 4c381d0..545e76c 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -251,7 +251,7 @@ namespace OpenSim.Framework.Servers | |||
| 251 | 251 | ||
| 252 | sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine); | 252 | sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine); |
| 253 | 253 | ||
| 254 | int timeNow = Util.EnvironmentTickCount(); | 254 | int timeNow = Environment.TickCount & Int32.MaxValue; |
| 255 | 255 | ||
| 256 | sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE"); | 256 | sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE"); |
| 257 | sb.Append(Environment.NewLine); | 257 | sb.Append(Environment.NewLine); |