diff options
Diffstat (limited to 'linden/indra/llui/llcombobox.h')
-rw-r--r-- | linden/indra/llui/llcombobox.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h index 95ad17a..596f659 100644 --- a/linden/indra/llui/llcombobox.h +++ b/linden/indra/llui/llcombobox.h | |||
@@ -67,7 +67,8 @@ public: | |||
67 | LLComboBox( | 67 | LLComboBox( |
68 | const std::string& name, | 68 | const std::string& name, |
69 | const LLRect &rect, | 69 | const LLRect &rect, |
70 | const std::string& label, | 70 | const std::string& label, |
71 | const LLFontGL* font = NULL, | ||
71 | void (*commit_callback)(LLUICtrl*, void*) = NULL, | 72 | void (*commit_callback)(LLUICtrl*, void*) = NULL, |
72 | void *callback_userdata = NULL | 73 | void *callback_userdata = NULL |
73 | ); | 74 | ); |
@@ -190,6 +191,7 @@ protected: | |||
190 | EPreferredPosition mListPosition; | 191 | EPreferredPosition mListPosition; |
191 | LLPointer<LLUIImage> mArrowImage; | 192 | LLPointer<LLUIImage> mArrowImage; |
192 | std::string mLabel; | 193 | std::string mLabel; |
194 | const LLFontGL* mGLFont; | ||
193 | 195 | ||
194 | private: | 196 | private: |
195 | S32 mButtonPadding; | 197 | S32 mButtonPadding; |