diff options
| author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
| commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
| tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | |
| parent | bad merge? (diff) | |
| download | opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz | |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs index ac6c0b4..4ff52eb 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | |||
| @@ -224,7 +224,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 224 | ConsoleDisplayList cdl = new ConsoleDisplayList(); | 224 | ConsoleDisplayList cdl = new ConsoleDisplayList(); |
| 225 | cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled); | 225 | cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled); |
| 226 | 226 | ||
| 227 | long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate; | 227 | long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate; |
| 228 | cdl.AddRow( | 228 | cdl.AddRow( |
| 229 | "Max scene throttle", | 229 | "Max scene throttle", |
| 230 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); | 230 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); |
| @@ -505,7 +505,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 505 | m_console.OutputFormat("Debug settings for {0}", m_udpServer.Scene.Name); | 505 | m_console.OutputFormat("Debug settings for {0}", m_udpServer.Scene.Name); |
| 506 | ConsoleDisplayList cdl = new ConsoleDisplayList(); | 506 | ConsoleDisplayList cdl = new ConsoleDisplayList(); |
| 507 | 507 | ||
| 508 | long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate; | 508 | long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate; |
| 509 | cdl.AddRow( | 509 | cdl.AddRow( |
| 510 | "max-scene-throttle", | 510 | "max-scene-throttle", |
| 511 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); | 511 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); |