Merge branch 'master' into careminster

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/InternetRelayClientView/Server/IRCClientView.cs
parent: Partially apply the core banlines fix (diff)
parent: Take watchdog alarm calling back outside the m_threads lock. (diff)
download: opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.zip
opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.gz
opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.bz2
opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.xz
1 files changed, 1 insertions, 1 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
            m_client = client;
            m_scene = scene;
-            Watchdog.StartThread(InternalLoop, "IRCClientView", ThreadPriority.Normal, false);
+            Watchdog.StartThread(InternalLoop, "IRCClientView", ThreadPriority.Normal, false, true);
        }
        private void SendServerCommand(string command)
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/InternetRelayClientView/Server/IRCClientView.cs
parent	Partially apply the core banlines fix (diff)
parent	Take watchdog alarm calling back outside the m_threads lock. (diff)
download	opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.zip opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.gz opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.bz2 opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.xz

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)