aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorMelanie2012-07-05 22:17:39 +0100
committerMelanie2012-07-05 22:17:39 +0100
commit5776351f6abd4ca8cca7344b26ab989425c67687 (patch)
treefe0c0355ceb25db47125525b9b72d2077cc3c29f /OpenSim/Region/ClientStack/Linden/UDP
parentMerge branch 'master' into careminster (diff)
parentminor: add client name to various login service log messages to disambiguate ... (diff)
downloadopensim-SC-5776351f6abd4ca8cca7344b26ab989425c67687.zip
opensim-SC-5776351f6abd4ca8cca7344b26ab989425c67687.tar.gz
opensim-SC-5776351f6abd4ca8cca7344b26ab989425c67687.tar.bz2
opensim-SC-5776351f6abd4ca8cca7344b26ab989425c67687.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 9cce725..e55e2c5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -270,7 +270,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
270 false, 270 false,
271 true, 271 true,
272 GetWatchdogIncomingAlarmData, 272 GetWatchdogIncomingAlarmData,
273 Watchdog.WATCHDOG_TIMEOUT_MS); 273 Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS);
274 274
275 Watchdog.StartThread( 275 Watchdog.StartThread(
276 OutgoingPacketHandler, 276 OutgoingPacketHandler,
@@ -279,7 +279,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
279 false, 279 false,
280 true, 280 true,
281 GetWatchdogOutgoingAlarmData, 281 GetWatchdogOutgoingAlarmData,
282 Watchdog.WATCHDOG_TIMEOUT_MS); 282 Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS);
283 283
284 m_elapsedMSSinceLastStatReport = Environment.TickCount; 284 m_elapsedMSSinceLastStatReport = Environment.TickCount;
285 } 285 }