summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-12-05 15:26:38 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-12-05 15:26:38 -0500
commitda135de77dea24427f5e658ebac43b77c215cc9b (patch)
treeb6ccf4971d081a6dfc78a2729d015a7f01e912b2 /indra/llui/llcombobox.h
parentb2d769534c82de2ac7b36f11ce6fab61f3e0d378 (diff)
parentfc4f6e2dacfc8944b1536004fed80c4ca3a24544 (diff)
Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.
Diffstat (limited to 'indra/llui/llcombobox.h')
-rwxr-xr-xindra/llui/llcombobox.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 1e04fb0866..67393504e7 100755
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -190,7 +190,7 @@ public:
virtual BOOL operateOnAll(EOperation op);
//========================================================================
-
+
void setLeftTextPadding(S32 pad);
void* getCurrentUserdata();