ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
This commit is contained in:
Melanie
2013-08-01 23:42:19 +01:00
parent 21f5e67030 7a5d11f8a7
commit 6fc03c7e6e
5 changed files with 112 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@@ -698,7 +698,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
DefaultClientPacketDebugLevel = newDebug;
MainConsole.Instance.OutputFormat(
"Debug packet debug for new clients set to {0}", DefaultClientPacketDebugLevel);
"Debug packet debug for new clients set to {0} in {1}", DefaultClientPacketDebugLevel, m_scene.Name);
}
else
{
@@ -1998,7 +1998,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//
// Instead, now wait for data present to be explicitly signalled. Evidence so far is that with
// modern mono it reduces CPU base load since there is no more continuous polling.
m_dataPresentEvent.WaitOne(100);
if (!m_packetSent)
m_dataPresentEvent.WaitOne(100);
Watchdog.UpdateThread();
}