From e347b9ad6526200b749ce63442ef600725476b4f Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Tue, 17 Oct 2017 20:27:42 +0300
Subject: MAINT-7592 Fixed the checkbox/label behavior

---
 indra/newview/llfloatertos.cpp                     | 8 +++++++-
 indra/newview/skins/default/xui/en/floater_tos.xml | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
index 1743d0fc69..4de34f13dd 100644
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -75,7 +75,9 @@ BOOL LLFloaterTOS::postBuild()
 
 	// disable Agree to TOS radio button until the page has fully loaded
 	LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-	tos_agreement->setEnabled( false );
+	tos_agreement->setEnabled(false);
+	LLTextBox* tos_list = getChild<LLTextBox>("agree_list");
+	tos_list->setEnabled(false);
 
 	// hide the SL text widget if we're displaying TOS with using a browser widget.
 	LLUICtrl *editor = getChild<LLUICtrl>("tos_text");
@@ -150,6 +152,8 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
 			// but if the page is unavailable, we need to do this now
 			LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
 			tos_agreement->setEnabled( true );
+			LLTextBox* tos_list = getChild<LLTextBox>("agree_list");
+			tos_list->setEnabled(true);
 		}
 	}
 #endif
@@ -230,6 +234,8 @@ void LLFloaterTOS::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent ev
 			// enable Agree to TOS radio button now that page has loaded
 			LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
 			tos_agreement->setEnabled( true );
+			LLTextBox* tos_list = getChild<LLTextBox>("agree_list");
+			tos_list->setEnabled(true);
 		}
 	}
 }
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index e3b49bf917..0d52a5652d 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -74,7 +74,9 @@
      name="agree_list"
      top_delta="15"
      word_wrap="true"
-     width="552">the Second Life Terms and Conditions, Privacy Policy, and Terms of Service, including the dispute resolution requirements. 
+     width="552"
+     text_color="LabelTextColor"
+     text_readonly_color="LabelDisabledColor">the Second Life Terms and Conditions, Privacy Policy, and Terms of Service, including the dispute resolution requirements. 
     </text>
     <button
      enabled="false"
-- 
cgit v1.2.3