diff options
| author | Cho <cho@lindenlab.com> | 2013-11-13 20:39:07 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-11-13 20:39:07 +0000 |
| commit | b267f6754efd2c77042fd4a3f6d2397eac461ce2 (patch) | |
| tree | 3e57a1afbbd6fb427f0107e019a56b6e9191ecb5 /indra | |
| parent | 377dd51688dea6bd83f0a9b70be12528f8a891c3 (diff) | |
included default secondlife tag in Flickr photo upload for ACME-1184
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterflickr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp index 5a05c47416..97361643ed 100644 --- a/indra/newview/llfloaterflickr.cpp +++ b/indra/newview/llfloaterflickr.cpp @@ -54,6 +54,7 @@ static LLRegisterPanelClassWrapper<LLFlickrAccountPanel> t_panel_account("llflic const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte const std::string DEFAULT_PHOTO_QUERY_PARAMETERS = "?sourceid=slshare_photo&utm_source=flickr&utm_medium=photo&utm_campaign=slshare"; const std::string DEFAULT_PHOTO_LINK_TEXT = "VISIT THIS LOCATION NOW"; +const std::string DEFAULT_TAG_TEXT = "secondlife "; /////////////////////////// //LLFlickrPhotoPanel/////// @@ -98,6 +99,7 @@ BOOL LLFlickrPhotoPanel::postBuild() mDescriptionTextBox = getChild<LLUICtrl>("photo_description"); mLocationCheckbox = getChild<LLUICtrl>("add_location_cb"); mTagsTextBox = getChild<LLUICtrl>("photo_tags"); + mTagsTextBox->setValue(DEFAULT_TAG_TEXT); mRatingComboBox = getChild<LLUICtrl>("rating_combobox"); mPostButton = getChild<LLUICtrl>("post_photo_btn"); mCancelButton = getChild<LLUICtrl>("cancel_photo_btn"); @@ -287,7 +289,7 @@ void LLFlickrPhotoPanel::clearAndClose() { mTitleTextBox->setValue(""); mDescriptionTextBox->setValue(""); - mTagsTextBox->setValue(""); + mTagsTextBox->setValue(DEFAULT_TAG_TEXT); LLFloater* floater = getParentByType<LLFloater>(); if (floater) |