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

Fix for all the texture panel bugs showing up in log

master
Ansariel 2024-06-30 00:47:19 +02:00
parent 8f2f1b0030
commit 0acb56649b
8 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/lluictrlfactory.cpp
View File

@ -141,7 +141,9 @@ void LLUICtrlFactory::createChildren(LLView* viewp, LLXMLNodePtr node, const wid
//LL_WARNS() << child_name << " is not a valid child of " << node->getName()->mString << LL_ENDL;
std::string name;
node->getAttributeString("name", name);
LL_WARNS() << child_name << " is not a valid child of " << node->getName()->mString << " for " << name << " (line no. " << node->getLineNumber() << ")" << LL_ENDL;
std::string child_name_attribute;
child_node->getAttributeString("name", child_name_attribute);
LL_WARNS() << child_name << " with name " << child_name_attribute << " is not a valid child of " << node->getName()->mString << " for " << name << " (line no. " << node->getLineNumber() << ")" << LL_ENDL;
// </FS:Ansariel>
}
else

10
indra/newview/fspanelface.cpp
View File

@ -5985,22 +5985,22 @@ void FSPanelFace::selectPBRChannel(S32 pbr_channel)
{
if (pbr_channel == PBRTYPE_NORMAL)
{
mTabsMatChannel->selectTabByName("panel_pbr_transforms_base_color");
mTabsPBRChannel->selectTabByName("panel_pbr_transforms_normal");
}
else if (pbr_channel == PBRTYPE_BASE_COLOR)
{
mTabsMatChannel->selectTabByName("panel_pbr_transforms_normal");
mTabsPBRChannel->selectTabByName("panel_pbr_transforms_base_color");
}
else if (pbr_channel == PBRTYPE_METALLIC_ROUGHNESS)
{
mTabsMatChannel->selectTabByName("panel_pbr_transforms_metallic");
mTabsPBRChannel->selectTabByName("panel_pbr_transforms_metallic");
}
else if (pbr_channel == PBRTYPE_EMISSIVE)
{
mTabsMatChannel->selectTabByName("panel_pbr_transforms_emissive");
mTabsPBRChannel->selectTabByName("panel_pbr_transforms_emissive");
}
else
{
mTabsMatChannel->selectTabByName("panel_pbr_transforms_all");
mTabsPBRChannel->selectTabByName("panel_pbr_transforms_all");
}
}

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="Texture">
<panel name="Texture" label="Textur">
<panel.string name="paste_error_face_selection_mismatch">
Falls mehrere Flächen kopiert werden, müssen auf dem Zielobjekt dieselbe Anzahl an Flächen selektiert sein.
</panel.string>

4
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -3282,14 +3282,14 @@ Low ↔ Lwst
top_pad="8"
width="132" />
</panel>
<!-- <FS:Zi> switchable edit texture/materials panel
<panel
label="Texture"
help_topic="toolbox_texture_tab"
name="Texture">
<!-- <FS:Zi> switchable edit texture/materials panel
filename="panel_tools_texture.xml">
-->
</panel>
-->
<panel
border="false"
follows="all"

3
indra/newview/skins/default/xui/en/panel_fs_tools_texture.xml
View File

@ -111,7 +111,6 @@
name="base_color_tint_picker"
label="Tint"
can_apply_immediately="true"
allow_no_texture="true"
tool_tip="Click to choose the base color tint"
/>
@ -2110,7 +2109,6 @@
max_val="255"
increment="1"
decimal_digits="0"
text_readonly_color="LabelDisabledColor"
enabled_control="FSInternalFaceHasBPSpecularMap"
/>
@ -2958,7 +2956,6 @@
top_pad="5"
right="-4"
height="2"
visibility_control="FSInternalCanEditObjectFaces"
/>
<panel

5
indra/newview/skins/starlight/xui/en/floater_tools.xml
View File

@ -3280,14 +3280,13 @@ Low ↔ Lwst
top_pad="8"
width="132" />
</panel>
<!-- <FS:Zi> switchable edit texture/materials panel
<panel
label="Texture"
help_topic="toolbox_texture_tab"
name="Texture">
<!-- <FS:Zi> switchable edit texture/materials panel
filename="panel_tools_texture.xml">
-->
</panel>
-->
<panel
border="false"
follows="all"

4
indra/newview/skins/starlightcui/xui/en/floater_tools.xml
View File

@ -3280,14 +3280,14 @@ Low ↔ Lwst
top_pad="8"
width="132" />
</panel>
<!-- <FS:Zi> switchable edit texture/materials panel
<panel
label="Texture"
help_topic="toolbox_texture_tab"
name="Texture">
<!-- <FS:Zi> switchable edit texture/materials panel
filename="panel_tools_texture.xml">
-->
</panel>
-->
<panel
border="false"
follows="all"

4
indra/newview/skins/vintage/xui/en/floater_tools.xml
View File

@ -3281,14 +3281,14 @@ Low ↔ Lwst
top_pad="8"
width="132" />
</panel>
<!-- <FS:Zi> switchable edit texture/materials panel
<panel
label="Texture"
help_topic="toolbox_texture_tab"
name="Texture">
<!-- <FS:Zi> switchable edit texture/materials panel
filename="panel_tools_texture.xml">
-->
</panel>
-->
<panel
border="false"
follows="all"