diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 2b3fd05d87..d699c51246 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -700,7 +700,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 triangle_normals; + static thread_local LLAlignedArray triangle_normals; try { triangle_normals.resize(count); diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 7d6bf4f9ee..452c6f136c 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1256,7 +1256,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++) @@ -1276,7 +1281,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++) @@ -1299,7 +1309,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++) 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 ded3d84bbd..f101e55730 100644 --- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml @@ -10,7 +10,7 @@ - Terraintexturen (erfordert 24-Bit-.tga-Dateien; Größe: 512x512 oder 1024x1024) + 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 e33faa3dd1..d5c0d6af19 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="450"> - Terrain Textures (requires 512x512 / 1024x1024, 24 bit .tga files) + Terrain Textures (1024x1024, 24 bit .tga files) - Texturas del terreno (requiere archivos .tga de 512x512 ó 1024x1024, 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 0103ec2bfb..4834bd3bec 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml @@ -5,7 +5,7 @@ - Textures du terrain (Requis : fichiers .tga de taille 512x512 ou 1024x1024, 24 bits) + Textures du terrain (Requis : fichiers .tga de taille 1024x1024, 24 bits) 1 (Basse altitude) 2 3 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 32ef93e2da..0c21ef16b9 100644 --- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml @@ -10,7 +10,7 @@ - Texture terreno (richiede file 512x512/1024x1024 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 49639d0e40..29145ac7a1 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml @@ -10,7 +10,7 @@ - 地形テクスチャ（512x512 / 1024x1024 の 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 ff23f2e15c..62ce4d1965 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 e0664b6f6b..c63dff8c9f 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml @@ -12,7 +12,7 @@ terreno" name="terrain_raise_spin"/> - Texturas de terreno (exige arquivos .tga 512x512 / 1024x1024, 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 17b328c6a7..a2a2988da7 100644 --- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml @@ -10,7 +10,7 @@ - Текстуры ландшафта (требования: 512x512 / 1024x1024, 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 10a70a1653..92de4c7f54 100644 --- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml @@ -10,7 +10,7 @@ - Yüzey Dokuları (512x512 / 1024x1024, 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 cec04bbb89..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 / 1024x1024，24 位元 .tga 檔格式） + 地形材質（須 1024x1024，24 位元 .tga 檔格式） 1（低） diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c651dbc993..46c2c804f8 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -192,7 +192,7 @@ class ViewerManifest(LLManifest,FSViewerManifest): # include the entire textures directory recursively with self.prefix(src_dst="*/textures"): self.path("*/*.tga") # Needed for legacy icons - self.path("*/*.jpg") # Needed for skin previews + self.path("*/*.jpg") self.path("*/*.png") self.path("*.tga") self.path("*.j2c")