From 9a1e7bd866b9d12542367f4d887a16f3c4cca01b Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 16 Jul 2022 05:04:32 +0200 Subject: [PATCH 1/4] About floater update --- indra/newview/skins/default/xui/en/floater_about.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index f477d1c7b7..8d16d94b76 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -140,7 +140,7 @@ The Firestorm Development Team: top_pad="4" width="450" wrap="true"> -Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Beq Janus, Cinder Roxley, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, Selo Jacobus, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic and Zi Ree. +Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Beq Janus, Cinder Roxley, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, ScentualLust, Selo Jacobus, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic and Zi Ree. Date: Sat, 16 Jul 2022 14:31:37 +0200 Subject: [PATCH 2/4] Update German translation that was forgotten at some point --- .../skins/default/xui/de/menu_inventory_gear_default.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml index 6b6c20fa53..88c5a3962d 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml @@ -13,9 +13,6 @@ - - - @@ -36,6 +33,9 @@ + + + From b9cb43844f504f63cef3a793e1f1763dfdfcfba3 Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Sun, 17 Jul 2022 23:01:41 +0200 Subject: [PATCH 3/4] FIRE-31818 - validate pointers when trying to get visible texture faces so trees with nullptr texture entries don't crash the viewer here --- indra/newview/llviewerobject.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 6c015d4b34..91c23760be 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -516,6 +516,7 @@ void LLViewerObject::markDead() } } +// Add visible (rendered) face count to inspect S32 LLViewerObject::getNumVisibleFaces() const { int v{0}; @@ -523,13 +524,16 @@ S32 LLViewerObject::getNumVisibleFaces() const { for (int i = 0;i < mDrawable->getNumFaces();i++) { - if(mDrawable->getFace(i)->getTextureEntry()->getAlpha() != 0.f) + const LLFace* f = mDrawable->getFace(i); + if (f && f->getTextureEntry() && f->getTextureEntry()->getAlpha() != 0.0f) + { v++; + } } } return v; }; - +// void LLViewerObject::dump() const { From 287577c2056e5348867598f8d32b47ee5f79aab4 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Mon, 18 Jul 2022 22:56:27 +0200 Subject: [PATCH 4/4] Tune the About floater block heights after re-merging Starlight skins --- indra/newview/skins/default/xui/de/floater_about.xml | 2 +- indra/newview/skins/default/xui/en/floater_about.xml | 4 ++-- indra/newview/skins/default/xui/es/floater_about.xml | 2 +- indra/newview/skins/default/xui/ru/floater_about.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index b8a174b981..9de9f956d9 100644 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml @@ -21,7 +21,7 @@ mit Open-Source-Beiträgen von: - + diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 8d16d94b76..b8f1f99301 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -91,7 +91,7 @@ Dummy Name replaced at run time - + diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml index 2d7f49011c..5d2469f891 100644 --- a/indra/newview/skins/default/xui/ru/floater_about.xml +++ b/indra/newview/skins/default/xui/ru/floater_about.xml @@ -21,7 +21,7 @@ Linden это: и переводами от: - + @@ -35,7 +35,7 @@ Linden это: Специальные благодарности для команды поддержки, издателей wiki, учителей и переводчиков: - + Firestorm использует Starlight, модифицированный для Firestorm. Он создан пользователями для пользователей, с целью предоставления альтернативного, более ясного и в более легкого в использовании интерфейса. Больше подробностей на <nolink>https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight</nolink>. Художники и дизайнеры интерфейса: