summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2013-11-19 16:56:17 -0500
committerJonathan Yap <none@none>2013-11-19 16:56:17 -0500
commit410a084f9a2e030efda635f5a51280b599ab7f78 (patch)
tree2c2f095cee8cf0b233d59eee2c8d99ad68c44c70 /indra/llui/llcombobox.cpp
parentdad992ea31b6b823c316400e61d50d1aa9e52330 (diff)
parentfcc885d4fc5ef63dad33e89a9324edc39d466d37 (diff)
STORM-1980 Merge changes Oz made (new way of detecting an agent has changed regions)
Modify code to make use of the changed callback
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();