aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorMelanie2013-08-01 23:42:19 +0100
committerMelanie2013-08-01 23:42:19 +0100
commit6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e (patch)
tree53f6b87b7d66451214f5486a5ff0ae91c3fa7742 /OpenSim/Region/ClientStack/Linden/UDP
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e.zip
opensim-SC-6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e.tar.gz
opensim-SC-6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e.tar.bz2
opensim-SC-6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 2a2c819..71b464b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -698,7 +698,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
698 { 698 {
699 DefaultClientPacketDebugLevel = newDebug; 699 DefaultClientPacketDebugLevel = newDebug;
700 MainConsole.Instance.OutputFormat( 700 MainConsole.Instance.OutputFormat(
701 "Debug packet debug for new clients set to {0}", DefaultClientPacketDebugLevel); 701 "Debug packet debug for new clients set to {0} in {1}", DefaultClientPacketDebugLevel, m_scene.Name);
702 } 702 }
703 else 703 else
704 { 704 {
@@ -1998,7 +1998,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1998 // 1998 //
1999 // Instead, now wait for data present to be explicitly signalled. Evidence so far is that with 1999 // Instead, now wait for data present to be explicitly signalled. Evidence so far is that with
2000 // modern mono it reduces CPU base load since there is no more continuous polling. 2000 // modern mono it reduces CPU base load since there is no more continuous polling.
2001 m_dataPresentEvent.WaitOne(100); 2001 if (!m_packetSent)
2002 m_dataPresentEvent.WaitOne(100);
2002 2003
2003 Watchdog.UpdateThread(); 2004 Watchdog.UpdateThread();
2004 } 2005 }