diff --git a/autobuild.xml b/autobuild.xml index e67dc567e8..da1d242710 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -292,9 +292,9 @@ archive hash - f65774ebabb256f2d217a872b0cf2b5b + d670d00aa732b97d105d287b62582762 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4812/15284/apr_suite-1.4.5.504800-darwin64-504800.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55065/512118/apr_suite-1.4.5.539073-darwin64-539073.tar.bz2 name darwin64 @@ -992,11 +992,11 @@ archive hash - 469f3e3a177c089deacad40428d23997 + fab47cbf13e89dd0359b5f5e995f6794 hash_algorithm md5 url - file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.02-windows-201991756.tar.bz2 + file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.03-windows-202191858.tar.bz2 name windows @@ -1006,11 +1006,11 @@ archive hash - 59766e450e7395fe996ae17c8c267c76 + a757fe92a8a48b247e23802c22153d1c hash_algorithm md5 url - file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.02-windows64-201991757.tar.bz2 + file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.03-windows64-202191859.tar.bz2 name windows64 @@ -1902,9 +1902,9 @@ archive hash - 534ea1079513a56a78c99bc08179c87c + f697ff80c30d3f387b2f5b42e53e574e url - file:///opt/firestorm/kdu-7.A.7-darwin-191472236.tar.bz2 + file:///opt/firestorm/kdu-8.0.5-darwin-202202246.tar.bz2 name darwin @@ -1914,9 +1914,9 @@ archive hash - 534ea1079513a56a78c99bc08179c87c + f697ff80c30d3f387b2f5b42e53e574e url - file:///opt/firestorm/kdu-7.A.7-darwin-191472236.tar.bz2 + file:///opt/firestorm/kdu-8.0.5-darwin-202202246.tar.bz2 name darwin64 diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 3a72d48b55..21f9faa410 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -138,8 +138,8 @@ else (USESYSTEMLIBS) optimized boost_thread-mt${addrsfx} debug boost_thread-mt${addrsfx}-d) set(BOOST_WAVE_LIBRARY - optimized libboost_wave-mt${addrsfx} - debug libboost_wave-mt${addrsfx}-gd) + optimized boost_wave-mt${addrsfx} + debug boost_wave-mt${addrsfx}-gd) endif (WINDOWS) endif (USESYSTEMLIBS) diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 3d05e8cfb4..3c43d71599 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.4.6 +6.4.7 diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp index 25d5700c09..6b70748d48 100644 --- a/indra/newview/fsareasearch.cpp +++ b/indra/newview/fsareasearch.cpp @@ -1015,8 +1015,10 @@ void FSAreaSearch::matchObject(FSObjectProperties& details, LLViewerObject* obje cell_params.column = "price"; if (details.sale_info.isForSale()) { - S32 price = details.sale_info.getSalePrice(); - cell_params.value = price > 0 ? llformat("%s%d", "L$", details.sale_info.getSalePrice()) : LLTrans::getString("free"); + LLStringUtil::format_map_t args; + args["COST"] = llformat("%d", details.sale_info.getSalePrice()); + std::string cost_label = LLTrans::getString("FSAreaSearch_Cost_Label", args); + cell_params.value = cost_label; } else { @@ -1026,7 +1028,7 @@ void FSAreaSearch::matchObject(FSObjectProperties& details, LLViewerObject* obje cell_params.column = "land_impact"; F32 cost = objectp->getLinksetCost(); - if (cost > 0.001) + if (cost > F_ALMOST_ZERO) { cell_params.value = cost; } diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index f26092f6e8..3621570aa2 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -327,32 +327,9 @@ BOOL LLPanelMainInventory::postBuild() mGearMenuButton = getChild("options_gear_btn"); initListCommandsHandlers(); -// - //const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()); - //const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost()); - //const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost()); - S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost(); - S32 sound_upload_cost = LLAgentBenefitsMgr::current().getSoundUploadCost(); - S32 animation_upload_cost = LLAgentBenefitsMgr::current().getAnimationUploadCost(); - std::string texture_upload_cost_str; - std::string sound_upload_cost_str; - std::string animation_upload_cost_str; -#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"); - } - 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); - } -// - + const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()); + const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost()); + const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost()); LLMenuGL* menu = (LLMenuGL*)mMenuAddHandle.get(); if (menu) @@ -2075,31 +2052,9 @@ void LLPanelMainInventory::setUploadCostIfNeeded() LLMenuGL* menu = (LLMenuGL*)mMenuAddHandle.get(); if(mNeedUploadCost && menu) { -// - //const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()); - //const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost()); - //const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost()); - S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost(); - S32 sound_upload_cost = LLAgentBenefitsMgr::current().getSoundUploadCost(); - S32 animation_upload_cost = LLAgentBenefitsMgr::current().getAnimationUploadCost(); - std::string texture_upload_cost_str; - std::string sound_upload_cost_str; - std::string animation_upload_cost_str; -#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"); - } - 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); - } -// + const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()); + const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost()); + const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost()); menu->getChild("Upload Image")->setLabelArg("[COST]", texture_upload_cost_str); menu->getChild("Upload Sound")->setLabelArg("[COST]", sound_upload_cost_str); menu->getChild("Upload Animation")->setLabelArg("[COST]", animation_upload_cost_str); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 53e79e46f5..74d5277ce9 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -627,32 +627,10 @@ void init_menus() gViewerWindow->setMenuBackgroundColor(false, !LLGridManager::getInstance()->isInSLBeta()); -// // *TODO:Also fix cost in llfolderview.cpp for Inventory menus - //const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()); - //const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost()); - //const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost()); - S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost(); - S32 sound_upload_cost = LLAgentBenefitsMgr::current().getSoundUploadCost(); - S32 animation_upload_cost = LLAgentBenefitsMgr::current().getAnimationUploadCost(); - std::string texture_upload_cost_str; - std::string sound_upload_cost_str; - std::string animation_upload_cost_str; -#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"); - } - 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); - } -// + const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()); + const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost()); + const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost()); gMenuHolder->childSetLabelArg("Upload Image", "[COST]", texture_upload_cost_str); gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", sound_upload_cost_str); gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", animation_upload_cost_str); @@ -11067,13 +11045,6 @@ void LLUploadCostCalculator::calculateCost(const std::string& asset_type_str) { LL_WARNS() << "Unable to find upload cost for asset_type_str " << asset_type_str << LL_ENDL; } -#ifdef OPENSIM // - if (LLGridManager::getInstance()->isInOpenSim()) - { - mCostStr = upload_cost > 0 ? llformat("%s%d", "L$", upload_cost) : LLTrans::getString("free"); - } - else -#endif // OPENSIM // mCostStr = std::to_string(upload_cost); } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index a08157c9e4..ff69cb427e 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6907,16 +6907,9 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/) { LLGlobalEconomy::processEconomyData(msg, LLGlobalEconomy::getInstance()); - S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost(); - S32 sound_upload_cost = LLAgentBenefitsMgr::current().getSoundUploadCost(); - S32 animation_upload_cost = LLAgentBenefitsMgr::current().getAnimationUploadCost(); - std::string texture_upload_cost_str; - std::string sound_upload_cost_str; - std::string animation_upload_cost_str; - - 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"); + const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()); + const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost()); + const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost()); gMenuHolder->getChild("Upload Image")->setLabelArg("[COST]", texture_upload_cost_str); gMenuHolder->getChild("Upload Sound")->setLabelArg("[COST]", sound_upload_cost_str); gMenuHolder->getChild("Upload Animation")->setLabelArg("[COST]", animation_upload_cost_str); diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index a4f41162d7..9e50ab0066 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -5356,11 +5356,6 @@ Falls der Fehler weiterhin auftritt, überprüfen Sie bitte Ihre Netzwerk- und F [AMOUNT] US$ - - - kostenlos - - Gruppen-Bann @@ -7129,4 +7124,7 @@ Ihre aktuelle Position: [AVATAR_POS] (Unbekanntes Skript) + + [COST] L$ + diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f0316c4501..5f96031a3f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2439,9 +2439,6 @@ If you continue to experience problems, please check your network and firewall s US$ [AMOUNT] - - free - Group Ban Membership @@ -3192,4 +3189,5 @@ Your current position: [AVATAR_POS] Wear inventory folder Picture for Outfit (Unknown script) + L$[COST] diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 77144d10b5..938de0e50d 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -5107,9 +5107,6 @@ Visita https://secondlife-status.statuspage.io para ver si hay alguna incidencia [AMOUNT] US$ - - gratis - Expulsión de grupo diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index e082dccfa7..cfacc845dc 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -5131,9 +5131,6 @@ Segnala abuso US$ [AMOUNT] - - gratis - Espulsione da gruppo diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index 77e2b94812..235f7e6dc0 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -5039,9 +5039,6 @@ Jeśli problemy będą występowały nadal, proszę sprawdź sieć i ustawienia [AMOUNT] US$ - - darmowe - Bany grupowe diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 369eeb34dc..0049882917 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -5320,9 +5320,6 @@ http://www.firestormviewer.org/support за помощь в решении эт US$ [AMOUNT] - - бесплатно - Бан группы diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 40358b285e..a2c95da968 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1320,7 +1320,7 @@ class DarwinManifest(ViewerManifest): # copy additional libs in /Contents/MacOS/ self.path(os.path.join(relpkgdir, "libndofdev.dylib"), dst="Resources/libndofdev.dylib") - # self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib") + self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib") # CEF framework goes inside Contents/Frameworks. # Remember where we parked this car.