summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-10-14 17:25:24 -0700
committerMerov Linden <merov@lindenlab.com>2013-10-14 17:25:24 -0700
commitf6c7b906e1f1d1bcc56a1e71b1867a58c5b2381a (patch)
treeec9226508d7a3e1555b774fde915a8b299b35cd7 /indra/llui/llcombobox.cpp
parentc2f5365f986aab49d5c7cfa2834a68f5b35c09c2 (diff)
parent04b84ce07dd5bc8364f948ef0004e3dc5328f1b4 (diff)
Pull merge with lindenlab/viewer-bear
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();