diff options
| -rw-r--r-- | indra/newview/llfloaterflickr.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp index 74fdb9879c..4ed32c3cf3 100644 --- a/indra/newview/llfloaterflickr.cpp +++ b/indra/newview/llfloaterflickr.cpp @@ -195,7 +195,7 @@ void LLFlickrPhotoPanel::draw() mWorkingLabel->setVisible(!(previewp && previewp->getSnapshotUpToDate())); // Enable Post if we have a preview to send and no on going connection being processed - mPostButton->setEnabled(no_ongoing_connection && (previewp && previewp->getSnapshotUpToDate()) && (mRatingComboBox && mRatingComboBox->getValue().isDefined())); + mPostButton->setEnabled(no_ongoing_connection && (previewp && previewp->getSnapshotUpToDate())); // Draw the rest of the panel on top of it LLPanel::draw(); @@ -231,7 +231,7 @@ void LLFlickrPhotoPanel::onVisibilityChange(const LLSD& new_visibility) previewp->setContainer(this); previewp->setSnapshotType(previewp->SNAPSHOT_WEB); - previewp->setSnapshotFormat(LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG); + previewp->setSnapshotFormat(LLFloaterSnapshot::SNAPSHOT_FORMAT_PNG); previewp->setThumbnailSubsampled(TRUE); // We want the preview to reflect the *saved* image previewp->setAllowRenderUI(FALSE); // We do not want the rendered UI in our snapshots previewp->setAllowFullScreenPreview(FALSE); // No full screen preview in SL Share mode @@ -328,7 +328,6 @@ void LLFlickrPhotoPanel::clearAndClose() { mTitleTextBox->setValue(""); mDescriptionTextBox->setValue(""); - mTagsTextBox->setValue(DEFAULT_TAG_TEXT); LLFloater* floater = getParentByType<LLFloater>(); if (floater) diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml index 01116c6c4c..4516c01670 100644 --- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml @@ -183,21 +183,20 @@ Use "" for multi-word tags follows="left|top" top_pad="16" left="9" - label="Choose Flickr rating (required)..." name="rating_combobox" tool_tip="Flickr content rating" height="21" width="250"> <combo_box.item - label="Safe content rating" + label="Safe Flickr rating" name="SafeRating" value="1" /> <combo_box.item - label="Moderate content rating" + label="Moderate Flickr rating" name="ModerateRating" value="2" /> <combo_box.item - label="Restricted content rating" + label="Restricted Flickr rating" name="RestrictedRating" value="3" /> </combo_box> |