summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-09-02 20:24:06 -0700
committerRichard Linden <none@none>2011-09-02 20:24:06 -0700
commitfc45e9cbf6ea74412acd8bb55098cfd15493292b (patch)
tree27c697035feb1d5d7e6de07e9834d49271b5b1ee /indra/llui
parent0ab6eee0996c78d32b722157140cea5a21a5e460 (diff)
parent1836dd12c9b45e90aeab095dd4cc3e9cdcaf2190 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llcombobox.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index cddda03faf..89d8842393 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -525,15 +525,12 @@ void LLComboBox::createLineEditor(const LLComboBox::Params& p)
else
{
mButton->setRect(rect);
- mButton->setTabStop(TRUE);
- mButton->setHAlign(LLFontGL::LEFT);
mButton->setLabel(mLabel.getString());
if (mTextEntry)
{
mTextEntry->setVisible(FALSE);
}
- mButton->setFollowsAll();
}
}