OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-09-17 16:52:40 +02:00
parent f3f955b19b df77724bbc
commit 1e3914236d
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -462,9 +462,9 @@ namespace OpenSim.Region.ClientStack.Linden
{
IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>();
int baseCost = 0;
if (mm != null)
{
// XPTO: The cost should be calculated about here
baseCost = mm.UploadCharge;
if (llsdRequest.asset_type == "mesh")
{
@ -472,10 +472,9 @@ namespace OpenSim.Region.ClientStack.Linden
int modelcost;
ModelCost mc = new ModelCost();
if (!mc.MeshModelCost(llsdRequest.asset_resources, mm.UploadCharge, out modelcost,
if (!mc.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost,
meshcostdata, out error))
{
client.SendAgentAlertMessage(error, false);
LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();
@ -483,14 +482,15 @@ namespace OpenSim.Region.ClientStack.Linden
errorResponse.state = "error";
return errorResponse;
}
cost = (uint)modelcost;
}
else
{
cost = (uint)mm.UploadCharge;
cost = (uint)baseCost;
}
if (mm != null)
{
if (!mm.UploadCovered(client.AgentId, (int)cost))
{
client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);