From fd1ee58f87dfbad96e89675bf5ab002d2d3a347f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 11 Sep 2012 22:52:11 +0200
Subject: Add a missing brace, remove a useless temp variable, enable charging.
---
.../Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 9 +++------
1 file 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
cost = textures_cost;
}
else
+ {
cost = (uint)mm.UploadCharge;
+ }
if (!mm.UploadCovered(client.AgentId, (int)cost))
{
@@ -505,14 +507,9 @@ namespace OpenSim.Region.ClientStack.Linden
UUID parentFolder = llsdRequest.folder_id;
string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
- uint uploadCost = cost;
- // don't charge for meshs until we done them
- if (llsdRequest.asset_type == "mesh")
- uploadCost = 0;
-
AssetUploaderWithCost uploader =
new AssetUploaderWithCost(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
- llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile, uploadCost);
+ llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile, cost);
m_HostCapsObj.HttpListener.AddStreamHandler(
new BinaryStreamHandler(
--
cgit v1.1