aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2010-08-08 18:24:33 +0100
committerMelanie2010-08-08 18:24:33 +0100
commit321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2 (patch)
treefe6321cf65640d1e6c9fd94b65a3cf5981470204 /OpenSim/Region/ClientStack
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentAdd distance sort for null, too (diff)
downloadopensim-SC_OLD-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.zip
opensim-SC_OLD-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.gz
opensim-SC_OLD-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.bz2
opensim-SC_OLD-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index bbbf0be..209e35c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -901,6 +901,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
901 LLClientView client = new LLClientView(remoteEndPoint, m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode); 901 LLClientView client = new LLClientView(remoteEndPoint, m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
902 client.OnLogout += LogoutHandler; 902 client.OnLogout += LogoutHandler;
903 903
904 client.DisableFacelights = m_disableFacelights;
905
904 // Start the IClientAPI 906 // Start the IClientAPI
905 // Spin it off so that it doesn't clog up the LLUDPServer 907 // Spin it off so that it doesn't clog up the LLUDPServer
906 908