diff options
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 78636c4..0f90d37 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim | |||
74 | AppDomain.CurrentDomain.UnhandledException += | 74 | AppDomain.CurrentDomain.UnhandledException += |
75 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); | 75 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); |
76 | 76 | ||
77 | ServicePointManager.DefaultConnectionLimit = 6; | 77 | ServicePointManager.DefaultConnectionLimit = 12; |
78 | 78 | ||
79 | // Add the arguments supplied when running the application to the configuration | 79 | // Add the arguments supplied when running the application to the configuration |
80 | ArgvConfigSource configSource = new ArgvConfigSource(args); | 80 | ArgvConfigSource configSource = new ArgvConfigSource(args); |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 88957ff..580c005 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -467,6 +467,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
467 | 467 | ||
468 | if (llsdRequest.asset_type == "mesh") | 468 | if (llsdRequest.asset_type == "mesh") |
469 | { | 469 | { |
470 | cost += 20; // Constant for now to test showing a price | ||
471 | |||
470 | if (llsdRequest.asset_resources == null) | 472 | if (llsdRequest.asset_resources == null) |
471 | { | 473 | { |
472 | client.SendAgentAlertMessage("Unable to upload asset. missing information.", false); | 474 | client.SendAgentAlertMessage("Unable to upload asset. missing information.", false); |
@@ -480,7 +482,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
480 | uint textures_cost = (uint)llsdRequest.asset_resources.texture_list.Array.Count; | 482 | uint textures_cost = (uint)llsdRequest.asset_resources.texture_list.Array.Count; |
481 | textures_cost *= (uint)mm.UploadCharge; | 483 | textures_cost *= (uint)mm.UploadCharge; |
482 | 484 | ||
483 | cost = textures_cost; | 485 | cost += textures_cost; |
484 | } | 486 | } |
485 | else | 487 | else |
486 | { | 488 | { |