diff options
author | Diva Canto | 2010-08-08 09:51:17 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-08 09:51:17 -0700 |
commit | a87dbe198c99492ddeadb90de6e726fcdb70816c (patch) | |
tree | 2de1f66e2e1e2e3f8f248a8b39b798f576e5eea5 /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |
parent | Enabled GridInfoServiceInConnector for standalones. (diff) | |
parent | In my crusade against facelights, I am striking the killing blow. Add a (diff) | |
download | opensim-SC-a87dbe198c99492ddeadb90de6e726fcdb70816c.zip opensim-SC-a87dbe198c99492ddeadb90de6e726fcdb70816c.tar.gz opensim-SC-a87dbe198c99492ddeadb90de6e726fcdb70816c.tar.bz2 opensim-SC-a87dbe198c99492ddeadb90de6e726fcdb70816c.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 1b81105..ca5a297 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -153,6 +153,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
153 | private int m_defaultRTO = 0; | 153 | private int m_defaultRTO = 0; |
154 | private int m_maxRTO = 0; | 154 | private int m_maxRTO = 0; |
155 | 155 | ||
156 | private bool m_disableFacelights = false; | ||
157 | |||
156 | public Socket Server { get { return null; } } | 158 | public Socket Server { get { return null; } } |
157 | 159 | ||
158 | public LLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager) | 160 | public LLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager) |
@@ -190,6 +192,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
190 | 192 | ||
191 | m_defaultRTO = config.GetInt("DefaultRTO", 0); | 193 | m_defaultRTO = config.GetInt("DefaultRTO", 0); |
192 | m_maxRTO = config.GetInt("MaxRTO", 0); | 194 | m_maxRTO = config.GetInt("MaxRTO", 0); |
195 | m_disableFacelights = config.GetBoolean("DisableFacelights", false); | ||
193 | } | 196 | } |
194 | else | 197 | else |
195 | { | 198 | { |
@@ -898,6 +901,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
898 | 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); |
899 | client.OnLogout += LogoutHandler; | 902 | client.OnLogout += LogoutHandler; |
900 | 903 | ||
904 | client.DisableFacelights = m_disableFacelights; | ||
905 | |||
901 | // Start the IClientAPI | 906 | // Start the IClientAPI |
902 | client.Start(); | 907 | client.Start(); |
903 | } | 908 | } |