diff options
| author | merov <none@none> | 2014-01-11 01:00:35 +0000 |
|---|---|---|
| committer | merov <none@none> | 2014-01-11 01:00:35 +0000 |
| commit | 2202150af43a44ecf3d989f21ebf4ce5f79a23cc (patch) | |
| tree | 0acf03e9078f1e9a1bb31519d556f9de035522da /indra/newview/llfloaterflickr.cpp | |
| parent | 0c7cab771cb7972ed44eedf0c16133ef082eb9e1 (diff) | |
ACME-1243 : WIP : Populate filter drop down with filter list dynamically
Diffstat (limited to 'indra/newview/llfloaterflickr.cpp')
| -rw-r--r-- | indra/newview/llfloaterflickr.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp index 675266143d..8395c0db5a 100644 --- a/indra/newview/llfloaterflickr.cpp +++ b/indra/newview/llfloaterflickr.cpp @@ -36,6 +36,7 @@ #include "llflickrconnect.h" #include "llfloaterreg.h" #include "lliconctrl.h" +#include "llimagefiltersmanager.h" #include "llresmgr.h" // LLLocale #include "llsdserialize.h" #include "llloadingindicator.h" @@ -106,6 +107,14 @@ BOOL LLFlickrPhotoPanel::postBuild() mPostButton = getChild<LLUICtrl>("post_photo_btn"); mCancelButton = getChild<LLUICtrl>("cancel_photo_btn"); + // Update filter list + std::vector<std::string> filter_list = LLImageFiltersManager::getInstance()->getFiltersList(); + LLComboBox* filterbox = static_cast<LLComboBox *>(mFilterComboBox); + for (U32 i = 0; i < filter_list.size(); i++) + { + filterbox->add(filter_list[i]); + } + return LLPanel::postBuild(); } |