diff options
| author | Melanie | 2012-02-24 09:56:06 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-24 09:56:06 +0000 |
| commit | 37068d17c5a6a4679f75af12cbbcfc3c78790e33 (patch) | |
| tree | 42454c2fd6072b0baebb4f3d7632476de3ad18e9 /OpenSim/Region/OptionalModules/Agent | |
| parent | Partially apply the core banlines fix (diff) | |
| parent | Take watchdog alarm calling back outside the m_threads lock. (diff) | |
| download | opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.zip opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.gz opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.bz2 opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 7d7c5c5..0f62b2a 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -70,7 +70,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 70 | m_client = client; | 70 | m_client = client; |
| 71 | m_scene = scene; | 71 | m_scene = scene; |
| 72 | 72 | ||
| 73 | Watchdog.StartThread(InternalLoop, "IRCClientView", ThreadPriority.Normal, false); | 73 | Watchdog.StartThread(InternalLoop, "IRCClientView", ThreadPriority.Normal, false, true); |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | private void SendServerCommand(string command) | 76 | private void SendServerCommand(string command) |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs index eb39026..a7c5020 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs | |||
| @@ -57,7 +57,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 57 | 57 | ||
| 58 | m_listener.Start(50); | 58 | m_listener.Start(50); |
| 59 | 59 | ||
| 60 | Watchdog.StartThread(ListenLoop, "IRCServer", ThreadPriority.Normal, false); | 60 | Watchdog.StartThread(ListenLoop, "IRCServer", ThreadPriority.Normal, false, true); |
| 61 | m_baseScene = baseScene; | 61 | m_baseScene = baseScene; |
| 62 | } | 62 | } |
| 63 | 63 | ||