Fix release merge issues (included upstream changes not yet in release from bear)

1 files changed, 0 insertions, 7 deletions

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 56be52f69a..d4e14d9419 100755
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -534,13 +534,6 @@ 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();