diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
| commit | 1c909afe3998778e4cc045c9ab733e8afbf7c25b (patch) | |
| tree | 75c00a32a8e305280cbec253195d1113d628fc3e /indra/llui/llcombobox.h | |
| parent | bc59c04653bf1404e8148a8169208b146a123b28 (diff) | |
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llui/llcombobox.h')
| -rw-r--r-- | indra/llui/llcombobox.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 2b19c3c2e5..02aa0084ed 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -45,8 +45,7 @@ public: const LLRect &rect, const LLString& label, void (*commit_callback)(LLUICtrl*, void*) = NULL, - void *callback_userdata = NULL, - S32 list_width = 0 + void *callback_userdata = NULL ); virtual ~LLComboBox(); |