summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-07 11:39:06 -0500
committerOz Linden <oz@lindenlab.com>2014-01-07 11:39:06 -0500
commit69c32b04cfd52c6fbd34997fa6485a84435743ef (patch)
tree9e95073f5d7109b86ed5fdb06b26dae4416c7146 /indra/llui/llcombobox.h
parentdc2af90b04a16a41851874b9ab55b4ac61af2d7b (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
merge changes for 3.6.12-release
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();