diff options
author | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:30:16 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:30:16 -0500 |
commit | 9b42503379bc2e9698545543670306961f7db991 (patch) | |
tree | dad8c7ac114c65b70c5b6ec6cdc803d7307b365d /indra/llui/llcombobox.h | |
parent | 4514d8c5c3bd5e16ba8d84214ecd164cd0740864 (diff) | |
parent | d993d6347a2c9f559d9ee8c5ac8e9292944156f0 (diff) |
merge latest changes from Ima with 3.6.14-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(); |