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/llnamelistctrl.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/llnamelistctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp index e30c129..935e6ac 100644 --- a/linden/indra/newview/llnamelistctrl.cpp +++ b/linden/indra/newview/llnamelistctrl.cpp | |||
@@ -54,7 +54,7 @@ LLNameListCtrl::LLNameListCtrl(const std::string& name, | |||
54 | BOOL draw_border, | 54 | BOOL draw_border, |
55 | S32 name_column_index, | 55 | S32 name_column_index, |
56 | const std::string& tooltip) | 56 | const std::string& tooltip) |
57 | : LLScrollListCtrl(name, rect, cb, userdata, allow_multiple_selection, | 57 | : LLScrollListCtrl(name, rect, NULL, cb, userdata, allow_multiple_selection, |
58 | draw_border), | 58 | draw_border), |
59 | mNameColumnIndex(name_column_index), | 59 | mNameColumnIndex(name_column_index), |
60 | mAllowCallingCardDrop(FALSE), | 60 | mAllowCallingCardDrop(FALSE), |