diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llsearcheditor.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp index e6c5e3f334..8075575bab 100644 --- a/indra/llui/llsearcheditor.cpp +++ b/indra/llui/llsearcheditor.cpp @@ -155,8 +155,8 @@ void LLSearchEditor::setFocus( BOOL b ) void LLSearchEditor::onClearButtonClick(const LLSD& data) { - mSearchEditor->selectAll(); - mSearchEditor->doDelete(); // force keystroke callback + setText(LLStringUtil::null); + mSearchEditor->onCommit(); // force keystroke callback } void LLSearchEditor::handleKeystroke() diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index c9bdacd4b7..b0c0af9f9a 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -215,7 +215,7 @@ LLTabContainer::Params::Params() use_custom_icon_ctrl("use_custom_icon_ctrl", false), tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0), use_ellipses("use_ellipses"), - font_halign("font_halign") + font_halign("halign") { name(std::string("tab_container")); mouse_opaque = false; diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 92031be8c5..117c2e8174 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -927,7 +927,7 @@ void LLBottomTray::processShrinkButtons(S32* required_width, S32* buttons_freed_ else { // - mSpeakBtn->setLabelVisible(false); + //mSpeakBtn->setLabelVisible(false); // HACK: this button doesn't change size so label should not be turned off S32 panel_width = mSpeakPanel->getRect().getWidth(); S32 possible_shrink_width = panel_width - panel_min_width; @@ -1018,7 +1018,7 @@ void LLBottomTray::processExtendButtons(S32* available_width) S32 panel_max_width = mObjectDefaultWidthMap[RS_BUTTON_SPEAK]; S32 panel_width = mSpeakPanel->getRect().getWidth(); S32 possible_extend_width = panel_max_width - panel_width; - if (possible_extend_width > 0 && possible_extend_width <= *available_width) + if (possible_extend_width >= 0 && possible_extend_width <= *available_width) // HACK: this button doesn't change size so possible_extend_width will be 0 { mSpeakBtn->setLabelVisible(true); mSpeakPanel->reshape(panel_max_width, mSpeakPanel->getRect().getHeight()); diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 86eaa79587..cc60b97f92 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -64,7 +64,7 @@ <panel background_visible="false" follows="bottom|left" - height="50" + height="73" layout="topleft" left="9" visible="true" |