summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-12-12 09:59:50 -0800
committerMerov Linden <merov@lindenlab.com>2013-12-12 09:59:50 -0800
commit4745ab85dab9e418c49e5c4a722aa88548b8f39e (patch)
tree367001447fda9438c5beb03f2fb09bbe7e2b2abd /indra/llui/llcombobox.cpp
parent6a89cb6f25adafdf07a4241e7bbe6fee758c1048 (diff)
parenta4f121f065c580ac34e8caa666855c95eb29138b (diff)
Pull merge from lindenlab/viewer-acme
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rwxr-xr-xindra/llui/llcombobox.cpp7
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();