OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Pull client throttle multipler setting out of config source. Not an adjustable setting yet (and then only for debug purposes)

0.6.0-stable
Justin Clarke Casey 2008-11-03 19:02:44 +00:00
parent 6ea24799dd
commit 8dbd0118a8
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ClientStack/ClientStackUserSettings.cs
View File

@ -39,5 +39,11 @@ namespace OpenSim.Region.ClientStack
/// The settings for the throttle that governs how many packets in total are sent to the client. /// The settings for the throttle that governs how many packets in total are sent to the client.
/// </summary> /// </summary>
public ThrottleSettings TotalThrottleSettings; public ThrottleSettings TotalThrottleSettings;
/// <summary>
/// A multiplier applied to all client throttle settings. This is hopefully a temporary setting to iron out
/// bugs that appear if the existing incorrect * 8 throttle (bytes instead of bits) is corrected.
/// </summary>
public int ClientThrottleMultipler;
} }
} }

11
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -148,8 +148,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource,
AssetCache assetCache, AgentCircuitManager circuitManager) AssetCache assetCache, AgentCircuitManager circuitManager)
{ {
// XXX Temporary until we start unpacking the config source
ClientStackUserSettings userSettings = new ClientStackUserSettings(); ClientStackUserSettings userSettings = new ClientStackUserSettings();
userSettings.ClientThrottleMultipler = 8;
IConfig config = configSource.Configs["ClientStack.LindenUDP"];
if (config != null)
{
userSettings.ClientThrottleMultipler = config.GetInt("client_throttle_multiplier");
}
//m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler);
proxyPortOffset = proxyPortOffsetParm; proxyPortOffset = proxyPortOffsetParm;
listenPort = (uint) (port + proxyPortOffsetParm); listenPort = (uint) (port + proxyPortOffsetParm);