diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-11-12 14:06:38 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-11-12 14:06:38 -0500 |
| commit | d191585a3eec778e36e5f0c4b620c3d525c86c42 (patch) | |
| tree | 2612c0d1947e00d9ceba82b054a7a90113ffa752 /indra/llui/llcombobox.cpp | |
| parent | ac1d3a22f2034a5e3aba757bde72825643fa799c (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Merge. Refresh from viewer-release after 3.6.10 release
Diffstat (limited to 'indra/llui/llcombobox.cpp')
| -rwxr-xr-x | indra/llui/llcombobox.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index d4e14d9419..56be52f69a 100755 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -534,6 +534,13 @@ void LLComboBox::createLineEditor(const LLComboBox::Params& p) } } +void LLComboBox::setLeftTextPadding(S32 pad) +{ + S32 left_pad, right_pad; + mTextEntry->getTextPadding(&left_pad, &right_pad); + mTextEntry->setTextPadding(pad, right_pad); +} + void* LLComboBox::getCurrentUserdata() { LLScrollListItem* item = mList->getFirstSelected(); |