diff options
| author | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
| commit | e371d3208cdda87f8ea86adb591ed6225f0aa442 (patch) | |
| tree | f481acfbafcb7134c00ff519c0c12b41e7815d02 /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Logins work now, but avatars are green ugly gnomes. (diff) | |
| download | opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.zip opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.gz opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.bz2 opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 183aec0..45bede3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
| @@ -183,7 +183,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 183 | IConfig config = configSource.Configs["ClientStack.LindenUDP"]; | 183 | IConfig config = configSource.Configs["ClientStack.LindenUDP"]; |
| 184 | if (config != null) | 184 | if (config != null) |
| 185 | { | 185 | { |
| 186 | m_asyncPacketHandling = config.GetBoolean("async_packet_handling", false); | 186 | m_asyncPacketHandling = config.GetBoolean("async_packet_handling", true); |
| 187 | m_recvBufferSize = config.GetInt("client_socket_rcvbuf_size", 0); | 187 | m_recvBufferSize = config.GetInt("client_socket_rcvbuf_size", 0); |
| 188 | sceneThrottleBps = config.GetInt("scene_throttle_max_bps", 0); | 188 | sceneThrottleBps = config.GetInt("scene_throttle_max_bps", 0); |
| 189 | 189 | ||