MAINT-3496 FIXED Disable "Allow group access" option if "Sell passes to: group" is selected(and vice versa).

2 files changed, 35 insertions, 9 deletions

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 2b9c216e54..74592dbdde 100755
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -2331,7 +2331,7 @@ BOOL LLPanelLandAccess::postBuild()
 	childSetCommitCallback("public_access", onCommitPublicAccess, this);
 	childSetCommitCallback("limit_payment", onCommitAny, this);
 	childSetCommitCallback("limit_age_verified", onCommitAny, this);
-	childSetCommitCallback("GroupCheck", onCommitAny, this);
+	childSetCommitCallback("GroupCheck", onCommitGroupCheck, this);
 	childSetCommitCallback("PassCheck", onCommitAny, this);
 	childSetCommitCallback("pass_combo", onCommitAny, this);
 	childSetCommitCallback("PriceSpin", onCommitAny, this);
@@ -2496,11 +2496,11 @@ void LLPanelLandAccess::refresh()
 		}
 		
 		BOOL use_pass = parcel->getParcelFlag(PF_USE_PASS_LIST);
-		getChild<LLUICtrl>("PassCheck")->setValue(use_pass );
+		getChild<LLUICtrl>("PassCheck")->setValue(use_pass);
 		LLCtrlSelectionInterface* passcombo = childGetSelectionInterface("pass_combo");
 		if (passcombo)
 		{
-			if (public_access || !use_pass || !use_group)
+			if (public_access || !use_pass)
 			{
 				passcombo->selectByValue("anyone");
 			}
@@ -2593,12 +2593,11 @@ void LLPanelLandAccess::refresh_ui()
 			getChildView("limit_age_verified")->setEnabled(FALSE);
 
 
-			BOOL group_access = getChild<LLUICtrl>("GroupCheck")->getValue().asBoolean();
 			BOOL sell_passes = getChild<LLUICtrl>("PassCheck")->getValue().asBoolean();
 			getChildView("PassCheck")->setEnabled(can_manage_allowed);
 			if (sell_passes)
 			{
-				getChildView("pass_combo")->setEnabled(group_access && can_manage_allowed);
+				getChildView("pass_combo")->setEnabled(can_manage_allowed);
 				getChildView("PriceSpin")->setEnabled(can_manage_allowed);
 				getChildView("HoursSpin")->setEnabled(can_manage_allowed);
 			}
@@ -2657,6 +2656,32 @@ void LLPanelLandAccess::onCommitPublicAccess(LLUICtrl *ctrl, void *userdata)
 	onCommitAny(ctrl, userdata);
 }
 
+void LLPanelLandAccess::onCommitGroupCheck(LLUICtrl *ctrl, void *userdata)
+{
+	LLPanelLandAccess *self = (LLPanelLandAccess *)userdata;
+	LLParcel* parcel = self->mParcel->getParcel();
+	if (!parcel)
+	{
+		return;
+	}
+
+	BOOL use_pass_list = !self->getChild<LLUICtrl>("public_access")->getValue().asBoolean();
+	BOOL use_access_group = self->getChild<LLUICtrl>("GroupCheck")->getValue().asBoolean();
+	LLCtrlSelectionInterface* passcombo = self->childGetSelectionInterface("pass_combo");
+	if (passcombo)
+	{
+		if (use_access_group && use_pass_list)
+		{
+			if (passcombo->getSelectedValue().asString() == "group")
+			{
+				passcombo->selectByValue("anyone");
+			}
+		}
+	}
+
+	onCommitAny(ctrl, userdata);
+}
+
 // static
 void LLPanelLandAccess::onCommitAny(LLUICtrl *ctrl, void *userdata)
 {
@@ -2694,14 +2719,14 @@ void LLPanelLandAccess::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	{
 		use_access_list = TRUE;
 		use_pass_list = self->getChild<LLUICtrl>("PassCheck")->getValue().asBoolean();
-		if (use_access_group && use_pass_list)
+		LLCtrlSelectionInterface* passcombo = self->childGetSelectionInterface("pass_combo");
+		if (passcombo)
 		{
-			LLCtrlSelectionInterface* passcombo = self->childGetSelectionInterface("pass_combo");
-			if (passcombo)
+			if (use_access_group && use_pass_list)
 			{
 				if (passcombo->getSelectedValue().asString() == "group")
 				{
-					use_access_list = FALSE;
+					use_access_group = FALSE;
 				}
 			}
 		}
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 4f1c10274a..95612fcb4a 100755
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -366,6 +366,7 @@ public:
 
 	static void onCommitPublicAccess(LLUICtrl* ctrl, void *userdata);
 	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
+	static void onCommitGroupCheck(LLUICtrl* ctrl, void *userdata);
 	static void onClickRemoveAccess(void*);
 	static void onClickRemoveBanned(void*);