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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

meow-7.2.2
Ansariel 2023-04-21 16:37:08 +02:00
parent b36cc1444f 62730c5d41
commit 372f5a21f8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterimagepreview.cpp
View File

@ -186,6 +186,8 @@ BOOL LLFloaterImagePreview::postBuild()
getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[X_RES]", llformat("%d", mRawImagep->getWidth()));
getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[Y_RES]", llformat("%d", mRawImagep->getHeight()));
mEmptyAlphaCheck = getChild<LLCheckBoxCtrl>("strip_alpha_check");
if (mRawImagep->getComponents() != 4)
{
getChild<LLUICtrl>("image_alpha_warning")->setVisible(false);
@ -205,8 +207,6 @@ BOOL LLFloaterImagePreview::postBuild()
}
}
mEmptyAlphaCheck = getChild<LLCheckBoxCtrl>("strip_alpha_check");
if (emptyAlphaCount > (imageBytes / 4 * ALPHA_EMPTY_THRESHOLD_RATIO))
{
getChild<LLUICtrl>("image_alpha_warning")->setVisible(true);

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

@ -140,8 +140,8 @@
<menu_item_check label="Koordinaten" name="Coordinates"/>
<menu_item_check label="Parzelleneigenschaften" name="Parcel Properties"/>
<menu_item_check label="Menü „Erweitert“" name="Show Advanced Menu"/>
<menu_item_check label="Grafikgeschwindigkeit verbessern..." name="Performance"/>
</menu>
<menu_item_check label="Grafikgeschwindigkeit verbessern..." name="Performance"/>
<menu_item_call label="Nach Hause teleportieren" name="Teleport Home"/>
<menu_item_call label="Diesen Ort als Zuhause festlegen" name="Set Home to Here"/>
<menu label="Umgebung" name="Environment">