From 976f09ffc6b2943b4423cc1816d2ec57b7c98f3f Mon Sep 17 00:00:00 2001 From: Cho Date: Fri, 14 Mar 2014 19:07:16 +0100 Subject: Made location checkbox disabled when caption is empty for ACME-1375 --- indra/newview/llfloaterfacebook.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp index 0388f4dca8..fccb2799dc 100644 --- a/indra/newview/llfloaterfacebook.cpp +++ b/indra/newview/llfloaterfacebook.cpp @@ -281,8 +281,8 @@ void LLFacebookPhotoPanel::draw() mFilterComboBox->setEnabled(no_ongoing_connection); mRefreshBtn->setEnabled(no_ongoing_connection); mBtnPreview->setEnabled(no_ongoing_connection); - mLocationCheckbox->setEnabled(no_ongoing_connection); - + mLocationCheckbox->setEnabled(no_ongoing_connection && !mCaptionTextBox->getValue().asString().empty()); + // Reassign the preview floater if we have the focus and the preview exists if (hasFocus() && isPreviewVisible()) { @@ -452,7 +452,7 @@ void LLFacebookPhotoPanel::sendPhoto() std::string caption = mCaptionTextBox->getValue().asString(); // Add the location if required - bool add_location = mLocationCheckbox->getValue().asBoolean(); + bool add_location = (mLocationCheckbox->getEnabled() && mLocationCheckbox->getValue().asBoolean()); if (add_location) { // Get the SLURL for the location -- cgit v1.2.3