diff options
| author | Melanie | 2009-10-08 10:32:15 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-08 10:32:15 +0100 |
| commit | f6b8bac0fab3dfc3d25775e51bb89ee10feebb53 (patch) | |
| tree | de16f4c7c14fce6851a4cd9c80117d1cbdd4b38e /OpenSim/Region/OptionalModules | |
| parent | Correct a build break caused by an optimization in trunk (diff) | |
| parent | Remove ThreadTrackerTest. It's no longer relevant because the thread (diff) | |
| download | opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.zip opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.gz opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.bz2 opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs index 9273fb5..cd401a6 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs | |||
| @@ -360,7 +360,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
| 360 | m_listener.Name = "IRCConnectorListenerThread"; | 360 | m_listener.Name = "IRCConnectorListenerThread"; |
| 361 | m_listener.IsBackground = true; | 361 | m_listener.IsBackground = true; |
| 362 | m_listener.Start(); | 362 | m_listener.Start(); |
| 363 | ThreadTracker.Add(m_listener); | ||
| 364 | 363 | ||
| 365 | // This is the message order recommended by RFC 2812 | 364 | // This is the message order recommended by RFC 2812 |
| 366 | if (m_password != null) | 365 | if (m_password != null) |
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 | } |