diff options
| author | McCabe Maxsted | 2011-03-23 22:00:03 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-23 22:00:03 -0700 |
| commit | e92f6be91988665591b2b99c698552d295e98fef (patch) | |
| tree | 608a390344ec80cc3dfaeca3e05006afa1aca479 /linden/indra/newview/llfloatertest.cpp | |
| parent | Moved 'Reset all preferences to default' button to a more logical place: in t... (diff) | |
| download | meta-impy-e92f6be91988665591b2b99c698552d295e98fef.zip meta-impy-e92f6be91988665591b2b99c698552d295e98fef.tar.gz meta-impy-e92f6be91988665591b2b99c698552d295e98fef.tar.bz2 meta-impy-e92f6be91988665591b2b99c698552d295e98fef.tar.xz | |
Comboboxes can now use the font= xui setting
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llfloatertest.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloatertest.cpp b/linden/indra/newview/llfloatertest.cpp index e9aada3..1934dcc 100644 --- a/linden/indra/newview/llfloatertest.cpp +++ b/linden/indra/newview/llfloatertest.cpp | |||
| @@ -228,7 +228,9 @@ LLFloaterTestImpl::LLFloaterTestImpl() | |||
| 228 | combo = new LLComboBox(std::string("combo"), | 228 | combo = new LLComboBox(std::string("combo"), |
| 229 | LLRect(LEFT, y, LEFT+100, y-LLCOMBOBOX_HEIGHT), | 229 | LLRect(LEFT, y, LEFT+100, y-LLCOMBOBOX_HEIGHT), |
| 230 | std::string("Combobox Label"), | 230 | std::string("Combobox Label"), |
| 231 | onCommitCombo, this); | 231 | NULL, |
| 232 | onCommitCombo, | ||
| 233 | this); | ||
| 232 | combo->add(std::string("first item")); | 234 | combo->add(std::string("first item")); |
| 233 | combo->add(std::string("second item")); | 235 | combo->add(std::string("second item")); |
| 234 | combo->add(std::string("should go to the top"), ADD_TOP); | 236 | combo->add(std::string("should go to the top"), ADD_TOP); |