diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
| commit | b8fddce34d1737acf32d83dac423dbb7a948cc4a (patch) | |
| tree | adf4c05ab3a42b2d3fed8fbda23c2de97840bab7 /indra/llui | |
| parent | f73b795bb709b3060e06b4238ae4dac702f21301 (diff) | |
| parent | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff) | |
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 3 |
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(); } } |