aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMic Bowman2011-04-25 10:44:41 -0700
committerMic Bowman2011-04-25 10:44:41 -0700
commit024c12abc3aa42432e55e322141cad1edeb5bad1 (patch)
tree3666d30003824cd34bb002375b2d5b31bcb7addd /OpenSim/Region/OptionalModules
parentMerge branch 'master' into queuetest (diff)
downloadopensim-SC_OLD-024c12abc3aa42432e55e322141cad1edeb5bad1.zip
opensim-SC_OLD-024c12abc3aa42432e55e322141cad1edeb5bad1.tar.gz
opensim-SC_OLD-024c12abc3aa42432e55e322141cad1edeb5bad1.tar.bz2
opensim-SC_OLD-024c12abc3aa42432e55e322141cad1edeb5bad1.tar.xz
Cleaned up various configuration options. Removed the category throttle
limits because the only ones used now are the defaults (which are overwritten by the client throttles anyway). Updated the default rates to correspond to about 350kbps. Also added a configuration to disable adaptive throttle. The default is the previous behavior (no adaptation).
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index ddbc079..db17d8f 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -398,7 +398,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
398 if (client is LLClientView) 398 if (client is LLClientView)
399 { 399 {
400 LLClientView llClient = client as LLClientView; 400 LLClientView llClient = client as LLClientView;
401 401
402 if (firstClient) 402 if (firstClient)
403 { 403 {
404 report.AppendLine(GetServerThrottlesReport(llClient.UDPServer)); 404 report.AppendLine(GetServerThrottlesReport(llClient.UDPServer));
@@ -451,7 +451,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
451 int maxRegionNameLength = 14; 451 int maxRegionNameLength = 14;
452 int maxTypeLength = 4; 452 int maxTypeLength = 4;
453 453
454 string name = "SERVER AGENT LIMITS"; 454 string name = "SERVER AGENT RATES";
455 455
456 report.Append(GetColumnEntry(name, maxNameLength, columnPadding)); 456 report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
457 report.Append(GetColumnEntry("-", maxRegionNameLength, columnPadding)); 457 report.Append(GetColumnEntry("-", maxRegionNameLength, columnPadding));
@@ -461,13 +461,13 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
461 report.AppendFormat( 461 report.AppendFormat(
462 "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}", 462 "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
463 (throttleRates.Total * 8) / 1000, 463 (throttleRates.Total * 8) / 1000,
464 (throttleRates.ResendLimit * 8) / 1000, 464 (throttleRates.Resend * 8) / 1000,
465 (throttleRates.LandLimit * 8) / 1000, 465 (throttleRates.Land * 8) / 1000,
466 (throttleRates.WindLimit * 8) / 1000, 466 (throttleRates.Wind * 8) / 1000,
467 (throttleRates.CloudLimit * 8) / 1000, 467 (throttleRates.Cloud * 8) / 1000,
468 (throttleRates.TaskLimit * 8) / 1000, 468 (throttleRates.Task * 8) / 1000,
469 (throttleRates.TextureLimit * 8) / 1000, 469 (throttleRates.Texture * 8) / 1000,
470 (throttleRates.AssetLimit * 8) / 1000); 470 (throttleRates.Asset * 8) / 1000);
471 471
472 return report.ToString(); 472 return report.ToString();
473 } 473 }