diff options
| author | Cho <cho@lindenlab.com> | 2014-02-11 00:40:03 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-02-11 00:40:03 +0000 |
| commit | 67393b8d26a839bf75d2630aca3fc88ee7466768 (patch) | |
| tree | 7d37e1c6dbc269bc35acada65031d0e827a9bdbd | |
| parent | de89552dc968f5b87c305fc661d15a50956a70d6 (diff) | |
| parent | 5f7e462d0f4cb3d9bdb84a51e8922b5e9130366c (diff) | |
merge
| -rw-r--r-- | indra/newview/llfloaterfacebook.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloaterflickr.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloatertwitter.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp index 932d49811a..3e58b40c75 100644 --- a/indra/newview/llfloaterfacebook.cpp +++ b/indra/newview/llfloaterfacebook.cpp @@ -463,7 +463,8 @@ void LLFacebookPhotoPanel::updateResolution(BOOL do_update) S32 width = sdres[0]; S32 height = sdres[1]; - const std::string& filter_name = filterbox->getSimple(); + // Note : index 0 of the filter drop down is assumed to be "No filter" in whichever locale + std::string filter_name = (filterbox->getCurrentIndex() ? filterbox->getSimple() : ""); LLSnapshotLivePreview * previewp = static_cast<LLSnapshotLivePreview *>(mPreviewHandle.get()); if (previewp && combobox->getCurrentIndex() >= 0) diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp index 4ed32c3cf3..607b5b5df9 100644 --- a/indra/newview/llfloaterflickr.cpp +++ b/indra/newview/llfloaterflickr.cpp @@ -360,7 +360,8 @@ void LLFlickrPhotoPanel::updateResolution(BOOL do_update) S32 width = sdres[0]; S32 height = sdres[1]; - const std::string& filter_name = filterbox->getSimple(); + // Note : index 0 of the filter drop down is assumed to be "No filter" in whichever locale + std::string filter_name = (filterbox->getCurrentIndex() ? filterbox->getSimple() : ""); LLSnapshotLivePreview * previewp = static_cast<LLSnapshotLivePreview *>(mPreviewHandle.get()); if (previewp && combobox->getCurrentIndex() >= 0) diff --git a/indra/newview/llfloatertwitter.cpp b/indra/newview/llfloatertwitter.cpp index d5039bd933..e9db6e01dd 100644 --- a/indra/newview/llfloatertwitter.cpp +++ b/indra/newview/llfloatertwitter.cpp @@ -424,7 +424,8 @@ void LLTwitterPhotoPanel::updateResolution(BOOL do_update) S32 width = sdres[0]; S32 height = sdres[1]; - const std::string& filter_name = filterbox->getSimple(); + // Note : index 0 of the filter drop down is assumed to be "No filter" in whichever locale + std::string filter_name = (filterbox->getCurrentIndex() ? filterbox->getSimple() : ""); LLSnapshotLivePreview * previewp = static_cast<LLSnapshotLivePreview *>(mPreviewHandle.get()); if (previewp && combobox->getCurrentIndex() >= 0) |