Automated merge with ssh://hg.lindenlab.com/viewer/login-api/

1 files changed, 15 insertions, 8 deletions

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 2dc96d1fb3..c197c78a41 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -233,10 +233,6 @@ void handleNameTagOptionChanged(const LLSD& newvalue)
 	{
 		gSavedSettings.setBOOL("SmallAvatarNames", TRUE);
 	}
-	else
-	{
-		gSavedSettings.setBOOL("SmallAvatarNames", FALSE);
-	}
 }
 
 bool callback_skip_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater)
@@ -528,25 +524,26 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 	bool canChoose = gAgent.getID().notNull() &&
 	(gAgent.isMature() || gAgent.isGodlike());
 	
+	LLComboBox* maturity_combo = getChild<LLComboBox>("maturity_desired_combobox");
+	
 	if (canChoose)
 	{
 		
 		// if they're not adult or a god, they shouldn't see the adult selection, so delete it
 		if (!gAgent.isAdult() && !gAgent.isGodlike())
 		{
-			LLComboBox* pMaturityCombo = getChild<LLComboBox>("maturity_desired_combobox");
 			// we're going to remove the adult entry from the combo. This obviously depends
 			// on the order of items in the XML file, but there doesn't seem to be a reasonable
 			// way to depend on the field in XML called 'name'.
-			pMaturityCombo->remove(0);
+			maturity_combo->remove(0);
 		}
 		childSetVisible("maturity_desired_combobox", true);
-		childSetVisible("maturity_desired_prompt", true);
+		childSetVisible("maturity_desired_textbox", false);
 		
 	}
 	else
 	{
-		childSetVisible("maturity_desired_prompt", false);
+		childSetText("maturity_desired_textbox",  maturity_combo->getSelectedItemLabel());
 		childSetVisible("maturity_desired_combobox", false);
 	}
 	
@@ -880,10 +877,20 @@ void LLFloaterPreference::refreshEnabledState()
 	{
 		mRadioTerrainDetail->setValue(1);
 		mRadioTerrainDetail->setEnabled(FALSE);
+		for (S32 i = 0; i < mRadioTerrainDetail->getItemCount(); ++i)
+		{
+			mRadioTerrainDetail->setIndexEnabled(i, FALSE);
+		}
 	}
 	else
 	{
 		mRadioTerrainDetail->setEnabled(TRUE);
+		
+		for (S32 i = 0; i < mRadioTerrainDetail->getItemCount(); ++i)
+		{
+			mRadioTerrainDetail->setIndexEnabled(i, TRUE);
+		}
+		
 	}
 	
 	// WindLight