diff options
| author | Cho <cho@lindenlab.com> | 2014-02-06 00:42:11 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-02-06 00:42:11 +0000 |
| commit | a6123336e20ad8e6b597437e808a22d9a9a46c6b (patch) | |
| tree | dd8eb5b709cccc257c9f941cbffd4b11c88dd231 /indra | |
| parent | b0693c48ceb943dfae8d20183d101ec78a264da6 (diff) | |
Made Flickr rating default to Safe for ACME-1304
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterflickr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp index 2280d555e6..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(); 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> |