diff options
author | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
commit | 915ade1029eb39fcd8f3b997b4b8cf2b394c1eb9 (patch) | |
tree | 577c0d98b21d05f0b6f28241f2ab2b7ee31f8618 /indra/llui/llcombobox.h | |
parent | dd7b0f96157bdfbdd8892cc8aa209182ae777380 (diff) | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) |
merge changes for 3.6.11-release
Diffstat (limited to 'indra/llui/llcombobox.h')
-rwxr-xr-x | indra/llui/llcombobox.h | 2 |
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(); |