summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-01-29 14:21:43 -0800
committerMerov Linden <merov@lindenlab.com>2014-01-29 14:21:43 -0800
commitc7c755b82e736050a514792a4c4bbdee9bf981d3 (patch)
tree5e5a996eb46a5e14709beae72007642e22a8f5ac
parentb4405c5388d1d9f562d6450092ca55cdea4c94a3 (diff)
ACME-1272, ACME-1292 : Disable filter drop down when necessary
-rw-r--r--indra/newview/llfloaterfacebook.cpp1
-rw-r--r--indra/newview/llfloaterflickr.cpp1
-rw-r--r--indra/newview/llfloatertwitter.cpp6
3 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp
index 2b3afb7b18..df1643ee22 100644
--- a/indra/newview/llfloaterfacebook.cpp
+++ b/indra/newview/llfloaterfacebook.cpp
@@ -238,6 +238,7 @@ void LLFacebookPhotoPanel::draw()
mCancelButton->setEnabled(no_ongoing_connection);
mCaptionTextBox->setEnabled(no_ongoing_connection);
mResolutionComboBox->setEnabled(no_ongoing_connection);
+ mFilterComboBox->setEnabled(no_ongoing_connection);
mRefreshBtn->setEnabled(no_ongoing_connection);
mLocationCheckbox->setEnabled(no_ongoing_connection);
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 35d891fb6d..244a34c782 100644
--- a/indra/newview/llfloaterflickr.cpp
+++ b/indra/newview/llfloaterflickr.cpp
@@ -130,6 +130,7 @@ void LLFlickrPhotoPanel::draw()
mTagsTextBox->setEnabled(no_ongoing_connection);
mRatingComboBox->setEnabled(no_ongoing_connection);
mResolutionComboBox->setEnabled(no_ongoing_connection);
+ mFilterComboBox->setEnabled(no_ongoing_connection);
mRefreshBtn->setEnabled(no_ongoing_connection);
mLocationCheckbox->setEnabled(no_ongoing_connection);
diff --git a/indra/newview/llfloatertwitter.cpp b/indra/newview/llfloatertwitter.cpp
index 09821a2593..2c327b4cd3 100644
--- a/indra/newview/llfloatertwitter.cpp
+++ b/indra/newview/llfloatertwitter.cpp
@@ -123,10 +123,12 @@ void LLTwitterPhotoPanel::draw()
// Enable interaction only if no transaction with the service is on-going (prevent duplicated posts)
bool no_ongoing_connection = !(LLTwitterConnect::instance().isTransactionOngoing());
+ bool photo_checked = mPhotoCheckbox->getValue().asBoolean();
mCancelButton->setEnabled(no_ongoing_connection);
mStatusTextBox->setEnabled(no_ongoing_connection);
- mResolutionComboBox->setEnabled(no_ongoing_connection && mPhotoCheckbox->getValue().asBoolean());
- mRefreshBtn->setEnabled(no_ongoing_connection && mPhotoCheckbox->getValue().asBoolean());
+ mResolutionComboBox->setEnabled(no_ongoing_connection && photo_checked);
+ mFilterComboBox->setEnabled(no_ongoing_connection && photo_checked);
+ mRefreshBtn->setEnabled(no_ongoing_connection && photo_checked);
mLocationCheckbox->setEnabled(no_ongoing_connection);
mPhotoCheckbox->setEnabled(no_ongoing_connection);