summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterflickr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterflickr.cpp')
-rw-r--r--indra/newview/llfloaterflickr.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 8395c0db5a..cff57bfa13 100644
--- a/indra/newview/llfloaterflickr.cpp
+++ b/indra/newview/llfloaterflickr.cpp
@@ -361,13 +361,12 @@ void LLFlickrPhotoPanel::updateResolution(BOOL do_update)
// Merov :
// Get the old filter, compare to the current one "filter_name" and set if changed
// If changed, also force the updateSnapshot() here under
- S32 original_filter = previewp->getFilter();
- S32 filter = ("Gray Scale" == filter_name ? 1 : 0);
+ std::string original_filter = previewp->getFilter();
- if ((original_width != width) || (original_height != height) || (original_filter != filter))
+ if ((original_width != width) || (original_height != height) || (original_filter != filter_name))
{
previewp->setSize(width, height);
- previewp->setFilter(filter);
+ previewp->setFilter(filter_name);
// hide old preview as the aspect ratio could be wrong
lldebugs << "updating thumbnail" << llendl;