aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-07-23 19:32:08 +0100
committerMelanie2012-07-23 19:32:08 +0100
commit112df30ea364e3e5b7db22712718dd4e09fb22e6 (patch)
tree5dd1ba219e8fe8530e017a9902571f7425e36aaf /OpenSim
parentMerge branch 'master' into careminster (diff)
parentFix double-ping on logout by not sending a stop packet to the client (diff)
downloadopensim-SC-112df30ea364e3e5b7db22712718dd4e09fb22e6.zip
opensim-SC-112df30ea364e3e5b7db22712718dd4e09fb22e6.tar.gz
opensim-SC-112df30ea364e3e5b7db22712718dd4e09fb22e6.tar.bz2
opensim-SC-112df30ea364e3e5b7db22712718dd4e09fb22e6.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 140a953..86d8f62 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1515,7 +1515,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1515 if (!client.IsLoggingOut) 1515 if (!client.IsLoggingOut)
1516 { 1516 {
1517 client.IsLoggingOut = true; 1517 client.IsLoggingOut = true;
1518 client.Close(); 1518 client.Close(false);
1519 } 1519 }
1520 } 1520 }
1521 } 1521 }