From 1b78cb7123ed0ea4d1d055092e05c5fb6dee01b3 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 5 Aug 2020 14:32:19 +0200 Subject: [PATCH] FIRE-29977: Upload menu in inventory shows double currency symbol --- indra/newview/llpanelmaininventory.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index f26092f6e8..fb88cbc86d 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -2088,16 +2088,16 @@ void LLPanelMainInventory::setUploadCostIfNeeded() #ifdef OPENSIM if (LLGridManager::getInstance()->isInOpenSim()) { - texture_upload_cost_str = texture_upload_cost > 0 ? llformat("%s%d", "L$", texture_upload_cost) : LLTrans::getString("free"); - sound_upload_cost_str = sound_upload_cost > 0 ? llformat("%s%d", "L$", sound_upload_cost) : LLTrans::getString("free"); - animation_upload_cost_str = animation_upload_cost > 0 ? llformat("%s%d", "L$", animation_upload_cost) : LLTrans::getString("free"); + texture_upload_cost_str = texture_upload_cost > 0 ? llformat("%d", texture_upload_cost) : LLTrans::getString("free"); + sound_upload_cost_str = sound_upload_cost > 0 ? llformat("%d", sound_upload_cost) : LLTrans::getString("free"); + animation_upload_cost_str = animation_upload_cost > 0 ? llformat("%d", animation_upload_cost) : LLTrans::getString("free"); } else #endif { - texture_upload_cost_str = "L$" + llformat("%d", texture_upload_cost); - sound_upload_cost_str = "L$" + llformat("%d", sound_upload_cost); - animation_upload_cost_str = "L$" + llformat("%d", animation_upload_cost); + texture_upload_cost_str = llformat("%d", texture_upload_cost); + sound_upload_cost_str = llformat("%d", sound_upload_cost); + animation_upload_cost_str = llformat("%d", animation_upload_cost); } // menu->getChild("Upload Image")->setLabelArg("[COST]", texture_upload_cost_str);