aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-09-11 22:52:11 +0200
committerMelanie2012-09-11 22:52:11 +0200
commitfd1ee58f87dfbad96e89675bf5ab002d2d3a347f (patch)
tree5f3150b4f6b5a2a85da2b94e8e30094605102e21
parent report mesh upload costs ( fake values) (diff)
downloadopensim-SC-fd1ee58f87dfbad96e89675bf5ab002d2d3a347f.zip
opensim-SC-fd1ee58f87dfbad96e89675bf5ab002d2d3a347f.tar.gz
opensim-SC-fd1ee58f87dfbad96e89675bf5ab002d2d3a347f.tar.bz2
opensim-SC-fd1ee58f87dfbad96e89675bf5ab002d2d3a347f.tar.xz
Add a missing brace, remove a useless temp variable, enable charging.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs9
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 90ac8ce..9982556 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -482,7 +482,9 @@ namespace OpenSim.Region.ClientStack.Linden
482 cost = textures_cost; 482 cost = textures_cost;
483 } 483 }
484 else 484 else
485 {
485 cost = (uint)mm.UploadCharge; 486 cost = (uint)mm.UploadCharge;
487 }
486 488
487 if (!mm.UploadCovered(client.AgentId, (int)cost)) 489 if (!mm.UploadCovered(client.AgentId, (int)cost))
488 { 490 {
@@ -505,14 +507,9 @@ namespace OpenSim.Region.ClientStack.Linden
505 UUID parentFolder = llsdRequest.folder_id; 507 UUID parentFolder = llsdRequest.folder_id;
506 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); 508 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
507 509
508 uint uploadCost = cost;
509 // don't charge for meshs until we done them
510 if (llsdRequest.asset_type == "mesh")
511 uploadCost = 0;
512
513 AssetUploaderWithCost uploader = 510 AssetUploaderWithCost uploader =
514 new AssetUploaderWithCost(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, 511 new AssetUploaderWithCost(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
515 llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile, uploadCost); 512 llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile, cost);
516 513
517 m_HostCapsObj.HttpListener.AddStreamHandler( 514 m_HostCapsObj.HttpListener.AddStreamHandler(
518 new BinaryStreamHandler( 515 new BinaryStreamHandler(