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

Fix some line-endings to be newline only.

meow-7.2.2
Graham Linden 2019-05-03 14:58:51 -07:00
parent 217c6a86ec
commit 24acb7d5c3
3 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
indra/llui/lllineeditor.cpp
View File

@ -1690,44 +1690,44 @@ void LLLineEditor::doDelete()
}
void LLLineEditor::drawBackground()
{
F32 alpha = getCurrentTransparency();
if (mUseBgColor)
{
gl_rect_2d(getLocalRect(), mBgColor % alpha, TRUE);
}
else
{
bool has_focus = hasFocus();
LLUIImage* image;
if (mReadOnly)
{
image = mBgImageDisabled;
}
else if (has_focus || mShowImageFocused)
{
image = mBgImageFocused;
}
else
{
image = mBgImage;
}
if (!image) return;
// optionally draw programmatic border
if (has_focus)
{
LLColor4 tmp_color = gFocusMgr.getFocusColor();
tmp_color.setAlpha(alpha);
image->drawBorder(0, 0, getRect().getWidth(), getRect().getHeight(),
tmp_color,
gFocusMgr.getFocusFlashWidth());
}
LLColor4 tmp_color = UI_VERTEX_COLOR;
tmp_color.setAlpha(alpha);
image->draw(getLocalRect(), tmp_color);
}
void LLLineEditor::drawBackground()
{
F32 alpha = getCurrentTransparency();
if (mUseBgColor)
{
gl_rect_2d(getLocalRect(), mBgColor % alpha, TRUE);
}
else
{
bool has_focus = hasFocus();
LLUIImage* image;
if (mReadOnly)
{
image = mBgImageDisabled;
}
else if (has_focus || mShowImageFocused)
{
image = mBgImageFocused;
}
else
{
image = mBgImage;
}
if (!image) return;
// optionally draw programmatic border
if (has_focus)
{
LLColor4 tmp_color = gFocusMgr.getFocusColor();
tmp_color.setAlpha(alpha);
image->drawBorder(0, 0, getRect().getWidth(), getRect().getHeight(),
tmp_color,
gFocusMgr.getFocusFlashWidth());
}
LLColor4 tmp_color = UI_VERTEX_COLOR;
tmp_color.setAlpha(alpha);
image->draw(getLocalRect(), tmp_color);
}
}
void LLLineEditor::draw()

16
indra/newview/llfloatermyenvironment.cpp
View File

@ -162,14 +162,14 @@ void LLFloaterMyEnvironment::onOpen(const LLSD& key)
}
//-------------------------------------------------------------------------
void LLFloaterMyEnvironment::onShowFoldersChange()
{
bool show_check(getChild<LLCheckBoxCtrl>(CHECK_SHOWFOLDERS)->getValue().asBoolean());
mShowFolders = (show_check) ? LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS;
if (mInventoryList)
mInventoryList->setShowFolderState(mShowFolders);
void LLFloaterMyEnvironment::onShowFoldersChange()
{
bool show_check(getChild<LLCheckBoxCtrl>(CHECK_SHOWFOLDERS)->getValue().asBoolean());
mShowFolders = (show_check) ? LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS;
if (mInventoryList)
mInventoryList->setShowFolderState(mShowFolders);
}
void LLFloaterMyEnvironment::onFilterCheckChange()

30
indra/newview/skins/default/xui/en/floater_my_environments.xml
View File

@ -124,21 +124,21 @@
</layout_panel>
<layout_panel
auto_resize="false"
user_resize="false"
tab_group="1"
height="15">
<check_box
follows="left|bottom"
height="14"
initial_value="false"
label="Show All Folders"
layout="topleft"
name="chk_showfolders"
top="2"
left_delta="-1"
width="200" />
</layout_panel>
<layout_panel
user_resize="false"
tab_group="1"
height="15">
<check_box
follows="left|bottom"
height="14"
initial_value="false"
label="Show All Folders"
layout="topleft"
name="chk_showfolders"
top="2"
left_delta="-1"
width="200" />
</layout_panel>
<layout_panel
auto_resize="false"
tab_group="1"
height="31"