livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull merge from lindenlab/viewer-acme

meow-7.2.2
Merov Linden 2014-02-06 11:59:07 -08:00
parent 2ba7552b9c a6123336e2
commit b6fbc02f85
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterflickr.cpp
View File

@ -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)

7
indra/newview/skins/default/xui/en/panel_flickr_photo.xml
View File

@ -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>