livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer

meow-7.2.2
Ansariel 2022-08-02 12:08:32 +02:00
parent d7953c1e94 3f6c9e2f7a
commit 0d0d82fa97
14 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llmath/llvolume.cpp
View File

@ -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<LLVector4a,64> pt;
static thread_local LLAlignedArray<LLVector4a,64> pt;
pt.resize(mTotal) ;
for (S32 i=mTotalOut;i<mTotal;i++)
@ -6910,7 +6910,7 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
LLVector4a* norm = mNormals;
static LLAlignedArray<LLVector4a, 64> triangle_normals;
static thread_local LLAlignedArray<LLVector4a, 64> triangle_normals;
try
{
triangle_normals.resize(count);

21
indra/llrender/llimagegl.cpp
View File

@ -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++)

2
indra/newview/skins/default/xui/de/panel_region_terrain.xml
View File

@ -10,7 +10,7 @@
<spinner label="Obere Terraingrenze" name="terrain_raise_spin"/>
<spinner label="Untere Terraingrenze" name="terrain_lower_spin"/>
<text name="detail_texture_text">
Terraintexturen (erfordert 24-Bit-.tga-Dateien; Größe: 512x512 oder 1024x1024)
Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 1024x1024)
</text>
<text name="height_text_lbl">
1 (niedrig)

2
indra/newview/skins/default/xui/en/panel_region_terrain.xml
View File

@ -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)
</text>
<texture_picker
follows="left|top"

2
indra/newview/skins/default/xui/es/panel_region_terrain.xml
View File

@ -12,7 +12,7 @@ del terreno" name="terrain_raise_spin" left="180" label_width="180" width="250"/
<spinner bottom_delta="-34" label="Límite de bajada del
terreno" name="terrain_lower_spin" left="180" label_width="180" width="250"/>
<text name="detail_texture_text" width="350">
Texturas del terreno (requiere archivos .tga de 512x512 ó 1024x1024, 24 bits)
Texturas del terreno (requiere archivos .tga de 1024x1024, 24 bits)
</text>
<text name="height_text_lbl">
1 (bajo)

2
indra/newview/skins/default/xui/fr/panel_region_terrain.xml
View File

@ -5,7 +5,7 @@
<spinner label="Niveau de la mer" name="water_height_spin"/>
<spinner label="Altitude maximale" name="terrain_raise_spin"/>
<spinner label="Altitude minimale" name="terrain_lower_spin"/>
<text name="detail_texture_text">Textures du terrain (Requis : fichiers .tga de taille 512x512 ou 1024x1024, 24 bits)</text>
<text name="detail_texture_text">Textures du terrain (Requis : fichiers .tga de taille 1024x1024, 24 bits)</text>
<text name="height_text_lbl" width="95">1 (Basse altitude)</text>
<text name="height_text_lbl2" left_pad="60">2</text>
<text name="height_text_lbl3" width="70">3</text>

2
indra/newview/skins/default/xui/it/panel_region_terrain.xml
View File

@ -10,7 +10,7 @@
<spinner label="Limite altezza" name="terrain_raise_spin"/>
<spinner bottom_delta="-34" label="Limite profondità" name="terrain_lower_spin"/>
<text name="detail_texture_text">
Texture terreno (richiede file 512x512/1024x1024 24 bit TGA)
Texture terreno (richiede file 1024x1024 24 bit TGA)
</text>
<text name="height_text_lbl">
1 (basso)

2
indra/newview/skins/default/xui/ja/panel_region_terrain.xml
View File

@ -10,7 +10,7 @@
<spinner label="地形の上昇限度" name="terrain_raise_spin"/>
<spinner label="地形の下降限度" name="terrain_lower_spin"/>
<text name="detail_texture_text">
地形テクスチャ（512x512 / 1024x1024 の 24 bit .tga ファイル）
地形テクスチャ（1024x1024 の 24 bit .tga ファイル）
</text>
<text name="height_text_lbl">
1（低）

2
indra/newview/skins/default/xui/pl/panel_region_terrain.xml
View File

@ -7,7 +7,7 @@
<spinner label="Górny limit terenu" name="terrain_raise_spin" />
<spinner label="Dolny limit terenu" name="terrain_lower_spin" />
<text name="detail_texture_text">
Tekstury terenu (512x512 / 1024x1024, 24 bitowy plik .tga)
Tekstury terenu (1024x1024, 24 bitowy plik .tga)
</text>
<text name="height_text_lbl">
1 (Nisko)

2
indra/newview/skins/default/xui/pt/panel_region_terrain.xml
View File

@ -12,7 +12,7 @@ terreno" name="terrain_raise_spin"/>
<spinner bottom_delta="-34" label="Limite mais baixo do
terreno" name="terrain_lower_spin"/>
<text name="detail_texture_text">
Texturas de terreno (exige arquivos .tga 512x512 / 1024x1024, 24 bit)
Texturas de terreno (exige arquivos .tga 1024x1024, 24 bit)
</text>
<text name="height_text_lbl">
1 (Baixo)

2
indra/newview/skins/default/xui/ru/panel_region_terrain.xml
View File

@ -10,7 +10,7 @@
<spinner label="Лимит подьема ландшафта" name="terrain_raise_spin" left="220" label_width="160" width="230"/>
<spinner label="Лимит спуска ландшафта" name="terrain_lower_spin" left="220" label_width="160" width="230"/>
<text name="detail_texture_text">
Текстуры ландшафта (требования: 512x512 / 1024x1024, 24-битные, TGA)
Текстуры ландшафта (требования: 1024x1024, 24-битные, TGA)
</text>
<text name="height_text_lbl">
1 (Низ)

2
indra/newview/skins/default/xui/tr/panel_region_terrain.xml
View File

@ -10,7 +10,7 @@
<spinner label="Yüzey Yükslt. Limiti" name="terrain_raise_spin"/>
<spinner label="Yüzey Alçatma Limiti" name="terrain_lower_spin"/>
<text name="detail_texture_text">
Yüzey Dokuları (512x512 / 1024x1024, 24 bit .tga dosyalar gerektirir)
Yüzey Dokuları (1024x1024, 24 bit .tga dosyalar gerektirir)
</text>
<text name="height_text_lbl">
1 (Düşük)

2
indra/newview/skins/default/xui/zh/panel_region_terrain.xml
View File

@ -10,7 +10,7 @@
<spinner label="地形提升限制" name="terrain_raise_spin"/>
<spinner label="地形降低限制" name="terrain_lower_spin"/>
<text name="detail_texture_text">
地形材質（須 512x512 / 1024x1024，24 位元 .tga 檔格式）
地形材質（須 1024x1024，24 位元 .tga 檔格式）
</text>
<text name="height_text_lbl">
1（低）

2
indra/newview/viewer_manifest.py
View File

@ -192,7 +192,7 @@ class ViewerManifest(LLManifest,FSViewerManifest):
# include the entire textures directory recursively
with self.prefix(src_dst="*/textures"):
self.path("*/*.tga") # <FS:Ansariel> Needed for legacy icons
self.path("*/*.jpg") # <FS:Ansariel> Needed for skin previews
self.path("*/*.jpg")
self.path("*/*.png")
self.path("*.tga")
self.path("*.j2c")