diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-05-07 09:47:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-07 09:47:37 -0500 |
| commit | 155ddf23363f1d5c534c69f50505faf67e51948f (patch) | |
| tree | 976912ed4fa3bc2af7b0b68201460f08614748b5 /indra/newview/lltexturectrl.cpp | |
| parent | f79548ec68ebcef8f8f83705b65fd59da43c3e26 (diff) | |
| parent | f9473e8afcb624cc1b101195bf15943ec372b56f (diff) | |
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
Drtvwr 600 maint a
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 32f38de1e4..b35cd882db 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1372,19 +1372,19 @@ void LLFloaterTexturePicker::changeMode() { int index = mModeSelector->getValue().asInteger(); - mDefaultBtn->setVisible(index == PICKER_INVENTORY ? true : false); - mBlankBtn->setVisible(index == PICKER_INVENTORY ? true : false); - mNoneBtn->setVisible(index == PICKER_INVENTORY ? true : false); - mFilterEdit->setVisible(index == PICKER_INVENTORY ? true : false); - mInventoryPanel->setVisible(index == PICKER_INVENTORY ? true : false); + mDefaultBtn->setVisible(index == PICKER_INVENTORY); + mBlankBtn->setVisible(index == PICKER_INVENTORY); + mNoneBtn->setVisible(index == PICKER_INVENTORY); + mFilterEdit->setVisible(index == PICKER_INVENTORY); + mInventoryPanel->setVisible(index == PICKER_INVENTORY); - getChild<LLButton>("l_add_btn")->setVisible(index == PICKER_LOCAL ? true : false); - getChild<LLButton>("l_rem_btn")->setVisible(index == PICKER_LOCAL ? true : false); - getChild<LLButton>("l_upl_btn")->setVisible(index == PICKER_LOCAL ? true : false); - getChild<LLScrollListCtrl>("l_name_list")->setVisible(index == PICKER_LOCAL ? true : false); + getChild<LLButton>("l_add_btn")->setVisible(index == PICKER_LOCAL); + getChild<LLButton>("l_rem_btn")->setVisible(index == PICKER_LOCAL); + getChild<LLButton>("l_upl_btn")->setVisible(index == PICKER_LOCAL); + getChild<LLScrollListCtrl>("l_name_list")->setVisible(index == PICKER_LOCAL); - getChild<LLComboBox>("l_bake_use_texture_combo_box")->setVisible(index == PICKER_BAKE ? true : false); - getChild<LLCheckBoxCtrl>("hide_base_mesh_region")->setVisible(false);// index == 2 ? true : false); + getChild<LLComboBox>("l_bake_use_texture_combo_box")->setVisible(index == PICKER_BAKE); + getChild<LLCheckBoxCtrl>("hide_base_mesh_region")->setVisible(false);// index == 2); bool pipette_visible = (index == PICKER_INVENTORY) && (mInventoryPickType != PICK_MATERIAL); @@ -2293,8 +2293,8 @@ void LLTextureCtrl::draw() // Using the discard level, do not show the string if the texture is almost but not // fully loaded. if (mTexturep.notNull() && - (!mTexturep->isFullyLoaded()) && - (mShowLoadingPlaceholder == true)) + !mTexturep->isFullyLoaded() && + mShowLoadingPlaceholder) { U32 v_offset = 25; LLFontGL* font = LLFontGL::getFontSansSerif(); |