diff options
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem')
| -rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs index 7202601..16fe9e9 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs | |||
| @@ -152,7 +152,6 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
| 152 | m_thread.Name = "Content Management"; | 152 | m_thread.Name = "Content Management"; |
| 153 | m_thread.IsBackground = true; | 153 | m_thread.IsBackground = true; |
| 154 | m_thread.Start(); | 154 | m_thread.Start(); |
| 155 | ThreadTracker.Add(m_thread); | ||
| 156 | m_state = State.NONE; | 155 | m_state = State.NONE; |
| 157 | } | 156 | } |
| 158 | } | 157 | } |