diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:40:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:40:22 -0500 |
| commit | d1b4c5bf734b6d30ba0bb5a3bda3a4494100cc6d (patch) | |
| tree | 54a650e8e26dad00b3eaa3340b8bbf3083fc04b6 /indra/llui/llcombobox.cpp | |
| parent | 5ca4a4b8f34342ef510a4241bef4af7cd544d865 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge changes for 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(); |