diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
| commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
| tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Framework/Tests/ThreadTrackerTests.cs | |
| parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
| parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
| download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz | |
*remove conflicts
Diffstat (limited to 'OpenSim/Framework/Tests/ThreadTrackerTests.cs')
| -rw-r--r-- | OpenSim/Framework/Tests/ThreadTrackerTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Tests/ThreadTrackerTests.cs b/OpenSim/Framework/Tests/ThreadTrackerTests.cs index 37c75ef..15d5b73 100644 --- a/OpenSim/Framework/Tests/ThreadTrackerTests.cs +++ b/OpenSim/Framework/Tests/ThreadTrackerTests.cs | |||
| @@ -161,7 +161,7 @@ namespace OpenSim.Framework.Tests | |||
| 161 | /// Worker thread 0 | 161 | /// Worker thread 0 |
| 162 | /// </summary> | 162 | /// </summary> |
| 163 | /// <param name="o"></param> | 163 | /// <param name="o"></param> |
| 164 | public void run( object o) | 164 | public void run(object o) |
| 165 | { | 165 | { |
| 166 | while (running) | 166 | while (running) |
| 167 | { | 167 | { |