aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-18 20:36:26 +0100
committerJustin Clark-Casey (justincc)2011-04-18 20:36:26 +0100
commit8533c63d8903d896da0bbbcebb00d48c4e2415f6 (patch)
tree95f0db9dc79a1d51def32b491df0c9913ad2c45b /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
parentProvide a configuration setting to control whether multiple taken objects are... (diff)
parentMerge branch 'master' into test-merge0418 (diff)
downloadopensim-SC_OLD-8533c63d8903d896da0bbbcebb00d48c4e2415f6.zip
opensim-SC_OLD-8533c63d8903d896da0bbbcebb00d48c4e2415f6.tar.gz
opensim-SC_OLD-8533c63d8903d896da0bbbcebb00d48c4e2415f6.tar.bz2
opensim-SC_OLD-8533c63d8903d896da0bbbcebb00d48c4e2415f6.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 583214c..d08b25f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -228,7 +228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
228 } 228 }
229 #endregion BinaryStats 229 #endregion BinaryStats
230 230
231 m_throttle = new TokenBucket(null, sceneThrottleBps, sceneThrottleBps); 231 m_throttle = new TokenBucket(null, sceneThrottleBps);
232 ThrottleRates = new ThrottleRates(configSource); 232 ThrottleRates = new ThrottleRates(configSource);
233 } 233 }
234 234