From 9d47ba0eab3b2599e26a4c13b635265ec277df99 Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Mon, 19 Jan 2026 20:22:18 +1000 Subject: [PATCH 1/6] Fix hollowed prims not shading correctly and appearing not smooth Merged upstream in SLViewer PR#5293 --- indra/llmath/llvolume.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index fdba9b2ffa..fc6a8f3cf8 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -929,7 +929,7 @@ bool LLProfile::generate(const LLProfileParams& params, bool path_open,F32 detai case LL_PCODE_HOLE_CIRCLE: case LL_PCODE_HOLE_SAME: default: - addHole(params, true, circle_detail, 0, hollow, 1.f); + addHole(params, false, circle_detail, 0, hollow, 1.f); break; } } From f531832f78b4b2f5e6220c05a4af4bcf052767e4 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> Date: Mon, 19 Jan 2026 23:40:31 +0200 Subject: [PATCH 2/6] p#124 Fix wrong max image size for model upload --- indra/newview/llviewertexture.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 5ab9da7c65..9849c3bf99 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1558,7 +1558,9 @@ bool LLViewerFetchedTexture::preCreateTexture(S32 usename/*= 0*/) // from local images, but this might become unsafe in case of changes to fetcher if (mBoostLevel == BOOST_PREVIEW) { - mRawImage->biasedScaleToPowerOfTwo(1024); + // A local file with a preview flag likely means mesh's texture upload + // which should follow normal upload scaling rules + mRawImage->biasedScaleToPowerOfTwo(LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT); } else { // leave black border, do not scale image content From a798aef4d2d183a6e6eeb894c52cff3c6a36b5da Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Wed, 21 Jan 2026 03:41:22 +1000 Subject: [PATCH 3/6] Removed mesh upload no havok warnings and added pathfinding no havok warnings --- indra/newview/llfloatermodelpreview.cpp | 8 -------- indra/newview/llfloaterpathfindingconsole.cpp | 7 +++++++ indra/newview/llmodelpreview.cpp | 9 --------- indra/newview/llviewermenu.cpp | 5 ++++- .../skins/default/xui/az/floater_model_preview.xml | 2 -- .../skins/default/xui/az/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/de/floater_model_preview.xml | 6 ------ .../skins/default/xui/de/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/en/floater_model_preview.xml | 3 --- .../skins/default/xui/en/floater_pathfinding_console.xml | 1 + .../skins/default/xui/es/floater_model_preview.xml | 3 --- .../skins/default/xui/es/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/fr/floater_model_preview.xml | 2 -- .../skins/default/xui/fr/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/it/floater_model_preview.xml | 6 ------ .../skins/default/xui/it/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/ja/floater_model_preview.xml | 6 ------ .../skins/default/xui/ja/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/pl/floater_model_preview.xml | 2 -- .../skins/default/xui/pl/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/pt/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/ru/floater_model_preview.xml | 2 -- .../skins/default/xui/ru/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/tr/floater_pathfinding_console.xml | 3 +++ .../skins/default/xui/zh/floater_model_preview.xml | 6 ------ .../skins/default/xui/zh/floater_pathfinding_console.xml | 6 +++--- 26 files changed, 45 insertions(+), 59 deletions(-) diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 9920f14a48..1bd95ced0f 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -327,14 +327,6 @@ bool LLFloaterModelPreview::postBuild() #endif // OPENSIM // -// Show an alert dialog if using the Opensim viewer as functionality will be limited without Havok -#if !LL_HAVOK - LLSD args; - args["FEATURE"] = getString("no_havok"); - LLNotificationsUtil::add("NoHavok", args); -#endif -// - getChild("warning_message")->setTextArg("[VURL]", validate_url); mUploadBtn = getChild("ok_btn"); diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index 994a5c0c02..a924139637 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -39,6 +39,7 @@ #include "llfloaterpathfindinglinksets.h" #include "llfloaterreg.h" #include "llhandle.h" +#include "llnotificationsutil.h" // #include "llpanel.h" #include "llpathfindingnavmeshzone.h" #include "llpathfindingpathtool.h" @@ -203,6 +204,12 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey) { setConsoleState(kConsoleStateLibraryNotImplemented); LL_WARNS() <<"Errror: cannot find pathing library implementation."< Show an alert dialog if using a viewer without pathfinding view / test support + LLSD args; + args["FEATURE"] = getString("no_havok"); + LLNotificationsUtil::add("NoHavok", args); + // } else { diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index f3294b958d..8df6a0a930 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -3387,9 +3387,6 @@ void LLModelPreview::updateStatusMessages() // physStatusIcon->setImage(img); // } //} -#if !LL_HAVOK - has_physics_error |= PhysicsError::NOHAVOK; -#endif auto physStatusIcon = mFMP->getChild("physics_status_message_icon"); @@ -3424,12 +3421,6 @@ void LLModelPreview::updateStatusMessages() physStatusIcon->setImage(img); } // - else if (has_physics_error & PhysicsError::NOHAVOK) - { - mFMP->childSetValue("physics_status_message_text", mFMP->getString("phys_status_no_havok")); - LLUIImagePtr img = LLUI::getUIImage("ModelImport_Status_Warning"); - physStatusIcon->setImage(img); - } else { // This should not happen diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 4cee27e363..2a1ba3b0ef 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6897,7 +6897,10 @@ class LLToolsEnablePathfindingView : public view_listener_t { bool handleEvent(const LLSD& userdata) { - return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isPathfindingViewEnabled(); + // We still want the menu option to be enabled so we can warn the user when there is no Pathfinding support + //return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isPathfindingViewEnabled(); + return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion(); + // } }; diff --git a/indra/newview/skins/default/xui/az/floater_model_preview.xml b/indra/newview/skins/default/xui/az/floater_model_preview.xml index 95ae5bc775..e013501f54 100644 --- a/indra/newview/skins/default/xui/az/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/az/floater_model_preview.xml @@ -1,6 +1,5 @@ - fizikası olan mesh yüklənir Xəta: DAE faylının təhlilində problem var - Ətraflı məlumatlar üçün jurnalı baxın. Xəbərdarlıq: Matrix formu standart olaraq X koordinatına uyğun deyil. Xəta: Modelin materialı standart modeldə yoxdur. @@ -24,7 +23,6 @@ Bəzi fiziki qabıqlar üçün vertex limiti aşıldı (256); Digər 'Analiz Metodu'nu sınayın. Bəzi modellər qabığın limitini keçir (256); 'Sadələşdirmə'ni sınayın. Mesh fizikası çox sıxdır və ya degenerativ üçbucaqları ehtiva edir. Həll etmək üçün Analiz/Sadələşdirmədən istifadə edin. - Bu versiya Havok-u dəstəkləmir və fizikanı Second Life-a yükləmək üçün tövsiyə edilmir. Nəticələr gözlənilməz ola bilər. 0,5 m-dən kiçik bir və ya bir neçə ölçü, yalnız gövdəyə əsaslanan fiziki formalar (təhlil edilmiş) düzgün işləyəcək. Tanınmamış xəta tapıldı. Hamısı diff --git a/indra/newview/skins/default/xui/az/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/az/floater_pathfinding_console.xml index dcd1ed5b07..e0e4c9895f 100644 --- a/indra/newview/skins/default/xui/az/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/az/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + Yol tapma önizləməsi/yoxlanması + Yol tapma kitabxanasının həyata keçirilməsi tapılmadı diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml index ddb822b9ce..7f8e14bca1 100644 --- a/indra/newview/skins/default/xui/de/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml @@ -1,8 +1,5 @@ - - Mesh-Upload mit Physics - Fehler: Fehler beim Modell-Parsen – Details siehe Protokoll. @@ -73,9 +70,6 @@ Das Physik-Netz enthält degenerierte Dreiecke. Probieren Sie Analysieren/Vereinfachen. - - Diese Version enthält keine Havok-Unterstützung und wird nicht für das Hochladen von Physik in Second Life empfohlen. Unvorhersehbare Ergebnisse sind möglich! - Eine oder mehrere Dimensionen sind kleiner als 0,5m - nur Hüllen-basierte (analysierte) physische Formen werden korrekt funktionieren. diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml index 827d9d3d62..ea0073554d 100644 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + Pathfinding-Ansicht/-Test + Pathfinding-Bibliotheksimplementierung nicht gefunden. diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index f7c90b5954..8743f3cf2c 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -11,8 +11,6 @@ name="Model Preview" title="Upload Model" help_topic="upload_model"> - mesh upload with physics - Error: Model parsing issue - see log for details. Warning: bind shape matrix is not in standard X-forward orientation. @@ -37,7 +35,6 @@ Some physical hulls exceed the vertex limit (256); try an alternative 'Analyze Method'. Some models exceed the hull limit (256); try 'simplify'. The physics mesh is too dense or contains degenerate triangles. Use Analyze/Simplify to resolve. - This version contains no Havok support and is not recommended for physics upload in Second Life. Results may be unpredictable. One or more dimensions is less than 0.5m, only hull-based (analyzed) physics shapes will work correctly. An unrecognized error was detected. All diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml index ddb75f5a5b..50994bef13 100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml @@ -11,6 +11,7 @@ single_instance="true" title="Pathfinding view / test" width="240"> + Pathfinding view / test Cannot find pathing library implementation. This region is not enabled for pathfinding. diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml index 2ccc36b734..b5e7d106f8 100644 --- a/indra/newview/skins/default/xui/es/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml @@ -1,8 +1,5 @@ - - subida mesh con física - Error: Problema de análisis de DAE - consulta los datos en el registro. diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml index 030b07e134..a1f189038e 100644 --- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + Vista/prueba de pathfinding + No se encuentra la implementación de la biblioteca de localización de rutas. diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml index 58a6396008..ba0bbae8ce 100644 --- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml @@ -1,6 +1,5 @@ -téléchargement du maillage avec physique Erreur : Problème d'analyse du modèle ; reportez-vous au journal pour plus de détails. Avertissement : la matrice de formes de reliure n'est pas dans l'orientation standard X-avant. Erreur : le matériau du modèle ne correspond pas à un sous-ensemble du modèle de référence. @@ -24,7 +23,6 @@ Certaines enveloppes physiques dépassent les limites de sommets. Certains modèles dépassent la limite de la coque (256) ; essayez de "simplifier".. Le maillage physique est trop dense ou contient des triangles non cohérents. Utilisez Analyser/Simplifier pour résoudre ce problème. -Cette version ne contient pas de support Havok et n'est pas recommandée pour le chargement de physiques dans Second Life. Les résultats peuvent être imprévisibles. Une ou plusieurs dimensions sont inférieures à 0,5 m, seules les formes physiques basées sur la coque (analysées) fonctionneront correctement. Une erreur inconnue a été détectée. Tout diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml index d1ad5b3bdb..933400f124 100644 --- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + Vue/Test de recherche de chemin + Implémentation de la bibliothèque de recherche de chemin introuvable diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml index 8bdf95d955..0e10ea3e30 100644 --- a/indra/newview/skins/default/xui/it/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml @@ -1,8 +1,5 @@ - - caricamento mesh con fisica - Errore: Errore elaborazione Dae - vedere il registro per informazioni dettagliate. @@ -73,9 +70,6 @@ La mesh fisica è troppo densa o contiene triangoli degenerati. Utilizzare Analizza/Semplifica per risolvere. - - Questa versione non contiene supporto Havok e non è consigliata per il caricamento di dati fisici in Second Life. I risultati potrebbero essere imprevedibili. - Una o più dimensioni sono inferiori a 0,5 m, solo le forme fisiche basate sull'hull (analizzate) funzioneranno correttamente. diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml index b7e0cbc595..da449ea772 100644 --- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + Visualizzazione / test pathfinding + Implementazione libreria percorsi non trovata. diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml index 854034af64..abe2cc405e 100644 --- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml @@ -1,8 +1,5 @@ - - 物理と一緒にメッシュをアップロードします。 - エラー：DAEファイルに問題が見つかりました。－詳細につきましてはログをご確認ください。 @@ -72,9 +69,6 @@ 物理メッシュが密すぎるか、極小な三角形が含まれています。この問題を解決するには、分析／簡素化を使用します。 - - このバージョンはHavok対応ではありません。このため、Second Lifeに物理をアップロードする事はお勧めできません。その結果は予測不可能なものとなります。 - １つ以上の寸法が０．５ｍ未満の場合、殻ベース（分析済み）の物理シェイプのみが正しく機能します。 diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml index d2dd465054..f1a82b2d02 100644 --- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + 経路探索の表示／テスト + 経路探索ライブラリの実装が見つかりません。 diff --git a/indra/newview/skins/default/xui/pl/floater_model_preview.xml b/indra/newview/skins/default/xui/pl/floater_model_preview.xml index 8d94fbeeb0..5d7fbcd81c 100644 --- a/indra/newview/skins/default/xui/pl/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_model_preview.xml @@ -1,6 +1,5 @@ -przesyłanie meszy z fizyką Błąd: Problem z parsowaniem modelu, zobacz log. Uwaga: Macierz powiązań kształtu nie jest w standardowej orientacji X-forward. Błąd: Materiał nie jest podzbiorem modelu referencyjnego. @@ -24,7 +23,6 @@ Pewne fizyczne powłoki przekroczyły limit wierzchołków (256); Spróbuj 'analizy'. Pewne modele przekroczyły limit powłok (256); Spróbuj 'upraszczania'. Mesz fizyki zbyt gęsty lub ma zdegenerowane trójkąty. Użyj Analizuj/Uprość. -Ta wersja nie zawiera wsparcia Havoka i nie jest zalecana dla przesyłania fizyki do Second Life. Wyniki mogą być nieprzewidywalne. Jeden z wymiarów ma mniej niż 0.5 m, tylko kształty fizyki oparte na kadłubie (po analizie) zadziałają poprawnie. Wykryto nierozpoznany błąd. Wszystko diff --git a/indra/newview/skins/default/xui/pl/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pl/floater_pathfinding_console.xml index 9c9ee53c4e..ec1794d776 100644 --- a/indra/newview/skins/default/xui/pl/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/pl/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + Podgląd odnajdywania ścieżek + Nie można znaleźć implementacji biblioteki szukania ścieżek. diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml index 47855656c8..20d5c5ea88 100644 --- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + Visualização/teste do pathfinding + Impossível encontrar a implementação de biblioteca de pathing. diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml index aa85fb1722..27d420c795 100644 --- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml @@ -1,6 +1,5 @@ - загрузка меша с физикой Ошибка: Проблема при анализе файла DAE – см. подробности в журнале. Предупреждение: форма матрицы стандартно не ориентирована по координате X. Ошибка: Материал модели не входит в эталонную модель. @@ -24,7 +23,6 @@ Для некоторых физических оболочек превышен лимит вершин(256); попробуйте другой 'Метод Анализа'. Некоторые модели превышают предел оболочек (256); попробуйте 'Упрощение'. Физика меша слишком плотная или содержит вырожденные треугольники. Используйте Анализ/Упрощение для решения. - Эта версия не поддерживает Havok и не рекомендуется для загрузки физики в Second Life. Результаты могут быть непредсказуемыми. Один или несколько размеров меньше 0,5м, корректно будут работать только физические формы, основанные на корпусе (проанализированные). Обнаружена нераспознанная ошибка. Все diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml index 9c95e71015..dd28a455af 100644 --- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + Просмотр/тестирование поиска пути + Не удалось найти реализацию библиотеки поиска пути diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml index 072f964273..4359236da9 100644 --- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml @@ -1,5 +1,8 @@ + + Yol bulma görüntüleme / test + Yol bulma kütüphanesi uygulaması bulunamıyor. diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml index 4cf08802d6..3a16fe77a9 100644 --- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml @@ -1,8 +1,5 @@ - - 物理網格模型上傳 - 錯誤：剖析模型時出錯，詳見記錄檔案。 @@ -72,9 +69,6 @@ 物理網格包含退化三角形。嘗試「分析/簡化」。 - - 此版本不包含Havok支援，不推薦用於上傳Second Life的物理內容。可能會出現不可預測的結果！ - 一個或多個次元小於0.5公尺 - 只有基於凸包的（分析過的）物理形狀才會正確工作。 diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml index b256bf1920..bfeecf1fce 100644 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml @@ -1,8 +1,8 @@ - - 路徑尋路導航網格生成失敗 - + + 尋路檢視 / 測試 + 找不到尋路函式庫的實作。 From c032816c56583b172c62cfc90f0a111f170b00f2 Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Wed, 21 Jan 2026 03:41:39 +1000 Subject: [PATCH 4/6] Fix crash in LLConvexDecompositionVHACD::executeStage accessing nullptr Merged upstream in SLViewer PR#5306 --- indra/llphysicsextensionsos/llconvexdecompositionvhacd.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/llphysicsextensionsos/llconvexdecompositionvhacd.cpp b/indra/llphysicsextensionsos/llconvexdecompositionvhacd.cpp index 78876f9f36..45a1b8f4ad 100644 --- a/indra/llphysicsextensionsos/llconvexdecompositionvhacd.cpp +++ b/indra/llphysicsextensionsos/llconvexdecompositionvhacd.cpp @@ -340,6 +340,12 @@ LLCDResult LLConvexDecompositionVHACD::executeStage(int stage) out_mesh.setVertices(ch.m_points); out_mesh.setIndices(ch.m_triangles); + if (!mBoundDecomp) + { + mVHACD->Clean(); + return LLCD_NULL_PTR; + } + mBoundDecomp->mDecomposedHulls.push_back(std::move(out_mesh)); } From d7a693b017ec3105a963ffd6076256f4290e83b3 Mon Sep 17 00:00:00 2001 From: Beq Date: Thu, 22 Jan 2026 09:32:34 +0000 Subject: [PATCH 5/6] KDU 7.6.1 - no internal threads --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 1d2ad9d6f8..24e2317cc3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1280,9 +1280,9 @@ archive hash - d9b763952986b176de253e804ffe16ee + 68b1eae7b0f0b1c689f867ccc0045816 url - file:///opt/firestorm/kdu-8.6-darwin64-252732257.tar.bz2 + file:///opt/firestorm/kdu-8.6.1-darwin64-260220143.tar.bz2 name darwin64 @@ -1292,9 +1292,9 @@ archive hash - 989865df0a7730ec89666e648916ddb1 + b06b152529a216491b954bc91850de0c url - file:///opt/firestorm/kdu-8.6-linux64-252731650.tar.bz2 + file:///opt/firestorm/kdu-8.6.1-linux64-260220142.tar.bz2 name linux64 @@ -1304,9 +1304,9 @@ archive hash - ab733beda1aa6b2b5ee756df57758846 + 7b042bef7b06f122ac9755c02ee40f7d url - file:///c:/cygwin/opt/firestorm/kdu-8.6-windows64-252731650.tar.bz2 + file:///c:/cygwin/opt/firestorm/kdu-8.6.1-windows64-260220142.tar.bz2 name windows64 From 8a52c735dab814cbc8fcf9afca1ee67e40d9b8b8 Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Thu, 22 Jan 2026 21:15:05 +1000 Subject: [PATCH 6/6] Update LLKDU cmake to match the new no internal threads behaviour --- indra/cmake/LLKDU.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index 8a86284421..428cc6a94b 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -43,5 +43,5 @@ if (USE_KDU) ${AUTOBUILD_INSTALL_DIR}/include/kdu ${LIBS_OPEN_DIR}/llkdu ) - #target_compile_definitions(ll::kdu INTERFACE KDU_NO_THREADS=1) // Enable KDU internal threading + target_compile_definitions(ll::kdu INTERFACE KDU_NO_THREADS=1) endif (USE_KDU)