summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-06 17:00:55 -0400
committerOz Linden <oz@lindenlab.com>2011-09-06 17:00:55 -0400
commit82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (patch)
tree779821c923eca8413bf7e21fd699b1af3ef7e6f3 /indra/llui
parente2dea0b4947a1b0fefc1ddbe33ac74776128d1c5 (diff)
parentfc45e9cbf6ea74412acd8bb55098cfd15493292b (diff)
merge changes for storm-1588
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();
}
}