From c01388fb0b639172f0c0f29f80dd01646fc1b89c Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 6 Jul 2022 21:10:22 +0300 Subject: [PATCH 1/5] SL-16793 Crash at LLProfile::addHole addHole can be accessed from main tread and from mesh thread, safeguard pt --- 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 5099920f32..47c4977afd 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -683,7 +683,7 @@ LLProfile::Face* LLProfile::addHole(const LLProfileParams& params, BOOL flat, F3 Face *face = addFace(mTotalOut, mTotal-mTotalOut,0,LL_FACE_INNER_SIDE, flat); - static LLAlignedArray pt; + static thread_local LLAlignedArray pt; pt.resize(mTotal) ; for (S32 i=mTotalOut;i Date: Wed, 6 Jul 2022 22:18:34 +0300 Subject: [PATCH 2/5] SL-17732 std_bad_alloc at setManualImage --- indra/llrender/llimagegl.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 9bd3a0a6b0..b9dc689d1a 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1248,7 +1248,12 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt if (pixels != nullptr) { use_scratch = true; - scratch = new U32[width * height]; + scratch = new(std::nothrow) U32[width * height]; + if (!scratch) + { + LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32)) + << " bytes for a manual image W" << width << " H" << height << LL_ENDL; + } U32 pixel_count = (U32)(width * height); for (U32 i = 0; i < pixel_count; i++) @@ -1268,7 +1273,12 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt if (pixels != nullptr) { use_scratch = true; - scratch = new U32[width * height]; + scratch = new(std::nothrow) U32[width * height]; + if (!scratch) + { + LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32)) + << " bytes for a manual image W" << width << " H" << height << LL_ENDL; + } U32 pixel_count = (U32)(width * height); for (U32 i = 0; i < pixel_count; i++) @@ -1291,7 +1301,12 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt if (pixels != nullptr) { use_scratch = true; - scratch = new U32[width * height]; + scratch = new(std::nothrow) U32[width * height]; + if (!scratch) + { + LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32)) + << " bytes for a manual image W" << width << " H" << height << LL_ENDL; + } U32 pixel_count = (U32)(width * height); for (U32 i = 0; i < pixel_count; i++) From a330095650b9e9d8aeb4f43faf5212d624f78953 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 7 Jul 2022 00:01:33 +0300 Subject: [PATCH 3/5] SL-16793 Potential crash at createSide --- 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 47c4977afd..2b23325bff 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -6821,7 +6821,7 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build) LLVector4a* norm = mNormals; - static LLAlignedArray triangle_normals; + static thread_local LLAlignedArray triangle_normals; try { triangle_normals.resize(count); From bfdf7dbec9a2dbddd2da8da4ceb4ef830a062e91 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 12 Jul 2022 17:18:12 +0300 Subject: [PATCH 4/5] SL-17754 FIXED "first_login_image.jpg" file is not loaded --- indra/newview/viewer_manifest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3ab6cc4975..de5ac5ed3d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -149,6 +149,7 @@ class ViewerManifest(LLManifest): with self.prefix(src_dst="skins"): # include the entire textures directory recursively with self.prefix(src_dst="*/textures"): + self.path("*/*.jpg") self.path("*/*.png") self.path("*.tga") self.path("*.j2c") From 3f6c9e2f7a8e1801fefe81f5f740501fda7dba69 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 20 Jul 2022 00:53:37 +0300 Subject: [PATCH 5/5] SL-17798 floater now allows 1024 textures --- indra/newview/skins/default/xui/da/panel_region_texture.xml | 4 ++-- indra/newview/skins/default/xui/de/panel_region_terrain.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_region_terrain.xml | 2 +- indra/newview/skins/default/xui/es/panel_region_terrain.xml | 4 ++-- indra/newview/skins/default/xui/fr/panel_region_terrain.xml | 4 ++-- indra/newview/skins/default/xui/it/panel_region_terrain.xml | 4 ++-- indra/newview/skins/default/xui/ja/panel_region_terrain.xml | 4 ++-- indra/newview/skins/default/xui/pl/panel_region_terrain.xml | 2 +- indra/newview/skins/default/xui/pt/panel_region_terrain.xml | 4 ++-- indra/newview/skins/default/xui/ru/panel_region_terrain.xml | 4 ++-- indra/newview/skins/default/xui/tr/panel_region_terrain.xml | 4 ++-- indra/newview/skins/default/xui/zh/panel_region_terrain.xml | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml index 45946fd222..c8a3ad328e 100644 --- a/indra/newview/skins/default/xui/da/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml @@ -7,8 +7,8 @@ ukendt - Terræn teksturer (kræver 512x512, 24 bit .tga filer) - + Terræn teksturer (kræver 1024x1024, 24 bit .tga filer) + 1 (Lav) diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml index 7801be30e4..42ba5b5269 100644 --- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml @@ -10,8 +10,8 @@ - Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 512x512) - + Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 1024x1024) + 1 (niedrig) diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index 8243c2715d..2aaea04a6d 100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml @@ -86,7 +86,7 @@ name="detail_texture_text" top="110" width="300"> - Terrain Textures (requires 512x512, 24 bit .tga files) + Terrain Textures (requires 1024x1024, 24 bit .tga files) - Texturas del terreno (requiere archivos .tga de 512x512, 24 bits) - + Texturas del terreno (requiere archivos .tga de 1024x1024, 24 bits) + 1 (bajo) diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml index 97f486d3a3..bbab00ca24 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml @@ -12,8 +12,8 @@ terrain" name="terrain_raise_spin"/> - Textures du terrain (fichiers .tga 512 x 512, 24 bit requis) - + Textures du terrain (fichiers .tga 1024 x 1024, 24 bit requis) + 1 (Bas) diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml index c61ac3ecce..e08c55f63b 100644 --- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml @@ -12,8 +12,8 @@ terreno" name="terrain_raise_spin"/> - Texture terreno (richiede file 512x512, 24 bit .tga) - + Texture terreno (richiede file 1024x1024, 24 bit .tga) + 1 (basso) diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml index fb853c1925..c1080a7d7b 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml @@ -10,8 +10,8 @@ - 地形テクスチャ（512x512 の 24 bit .tga ファイル） - + 地形テクスチャ（1024x1024 の 24 bit .tga ファイル） + 1（低） diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml index f086a52dcd..2d4286334f 100644 --- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml @@ -7,7 +7,7 @@ - Tekstury terenu (512x512 / 1024x1024, 24 bitowy plik .tga) + Tekstury terenu (1024x1024, 24 bitowy plik .tga) 1 (Nisko) diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml index 74330a8946..1d312aeed9 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml @@ -12,8 +12,8 @@ terreno" name="terrain_raise_spin"/> - Texturas de terreno (exige arquivos .tga 512x512, 24 bit) - + Texturas de terreno (exige arquivos .tga 1024x1024, 24 bit) + 1 (Baixo) diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml index af25565226..76b4f513a8 100644 --- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml @@ -10,8 +10,8 @@ - Текстуры ландшафта (требования: 512x512, 24-битные, TGA) - + Текстуры ландшафта (требования: 1024x1024, 24-битные, TGA) + 1 (Низ) diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml index 3226ee008e..e25047301d 100644 --- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml @@ -10,8 +10,8 @@ - Yüzey Dokuları (512x512, 24 bit .tga dosyalar gerektirir) - + Yüzey Dokuları (1024x1024, 24 bit .tga dosyalar gerektirir) + 1 (Düşük) diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml index 85e759e445..81bce46876 100644 --- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml @@ -10,7 +10,7 @@ - 地形材質（須 512x512，24 位元 .tga 檔格式） + 地形材質（須 1024x1024，24 位元 .tga 檔格式） 1（低）