diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2026-04-17 21:18:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-17 21:18:37 +0300 |
| commit | 3cb70cc3d70245c01764fadb7b0eb359d235a27b (patch) | |
| tree | 5f6917363c38b779ce1ee1c5627c48565d6872c0 | |
| parent | 9272e04afd47c6dff7835a617403df0b7555728f (diff) | |
#5664 remove non-ASCII7 characters from comments
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llvelopack.cpp | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index 7cfadb889d..8d544b360b 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -227,11 +227,11 @@ static void opj_free_user_data_write(void * user_data) */ static U32 estimate_num_layers(U32 surface) { - if (surface <= 1024) return 2; // Tiny (≤32×32) - else if (surface <= 16384) return 3; // Small (≤128×128) - else if (surface <= 262144) return 4; // Medium (≤512×512) + if (surface <= 1024) return 2; // Tiny (<=32x32) + else if (surface <= 16384) return 3; // Small (<=128x128) + else if (surface <= 262144) return 4; // Medium (<=512x512) else if (surface <= 1048576) return 5; // Up to ~1MP - else return 6; // Up to ~1.5–2MP + else return 6; // Up to ~1.5-2MP } /** diff --git a/indra/newview/llvelopack.cpp b/indra/newview/llvelopack.cpp index 28e989c4ba..8975f7d369 100644 --- a/indra/newview/llvelopack.cpp +++ b/indra/newview/llvelopack.cpp @@ -238,7 +238,7 @@ static bool custom_download_asset(void* user_data, { // The asset has already been downloaded at the coroutine level (before vpkc_download_updates). // This callback just copies the pre-downloaded file to where Velopack expects it. - // We cannot use getRawAndSuspend here — coroutine context is lost through the Rust FFI boundary. + // We cannot use getRawAndSuspend here - coroutine context is lost through the Rust FFI boundary. if (sPreDownloadedAssetPath.empty()) { LL_WARNS("Velopack") << "No pre-downloaded asset available" << LL_ENDL; @@ -786,7 +786,7 @@ static void ensure_update_manager(bool allow_downgrade) LL_INFOS("Velopack") << "Auto-detect failed (" << ll_safe_string(err) << "), falling back to explicit locator" << LL_ENDL; - // Auto-detection failed — construct an explicit locator. + // Auto-detection failed - construct an explicit locator. // This handles legacy DMG installs that don't have Velopack's // install state (UpdateMac, sq.version) in the bundle. vpkc_locator_config_t locator = {}; @@ -954,7 +954,7 @@ static void on_downloading_closed(const LLSD& notification, const LLSD& response sDownloadingNotification = nullptr; if (sIsRequired) { - // User closed the downloading dialog during a required update — re-show it + // User closed the downloading dialog during a required update - re-show it show_downloading_notification(sTargetVersion); } } @@ -1043,12 +1043,12 @@ void velopack_check_for_updates(const std::string& required_version, const std:: // strictly lower than what we're running (e.g., a retracted build). bool has_required = !required_version.empty(); int ver_cmp = has_required ? compare_running_version(required_version) : 0; - bool allow_downgrade = ver_cmp > 0; // running > required → rollback scenario + bool allow_downgrade = ver_cmp > 0; // running > required -> rollback scenario ensure_update_manager(allow_downgrade); if (!sUpdateManager) return; - // Ask Velopack to check its feed — this is the source of truth + // Ask Velopack to check its feed - this is the source of truth vpkc_update_info_t* update_info = nullptr; vpkc_update_check_t result = vpkc_check_for_updates(sUpdateManager, &update_info); @@ -1074,7 +1074,7 @@ void velopack_check_for_updates(const std::string& required_version, const std:: sPendingCheckInfo = update_info; // Determine if this is mandatory: running version is below VVM's required floor - bool is_required = ver_cmp < 0; // running < required → must update + bool is_required = ver_cmp < 0; // running < required -> must update sIsRequired = is_required; if (is_required) @@ -1085,12 +1085,12 @@ void velopack_check_for_updates(const std::string& required_version, const std:: return; } - // Optional update — check user preference + // Optional update - check user preference U32 updater_setting = gSavedSettings.getU32("UpdaterServiceSetting"); if (updater_setting == 3) { - // "Install each update automatically" — download silently, apply on quit + // "Install each update automatically" - download silently, apply on quit LL_INFOS("Velopack") << "Optional update to " << target_version << ", downloading automatically (UpdaterServiceSetting=3)" << LL_ENDL; velopack_download_pending_update(); |
