merge.

1 files changed, 32 insertions, 27 deletions

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 0ea4b1f6da..4100e2fc61 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -577,7 +577,7 @@ void LLLocationInputCtrl::reshape(S32 width, S32 height, BOOL called_from_parent
 
 	if (isHumanReadableLocationVisible)
 	{
-		positionMaturityIcon();
+		refreshMaturityIcon();
 	}
 }
 
@@ -737,32 +737,7 @@ void LLLocationInputCtrl::refreshLocation()
 	setText(location_name);
 	isHumanReadableLocationVisible = true;
 
-	// Updating maturity rating icon.
-	LLViewerRegion* region = gAgent.getRegion();
-	if (!region)
-		return;
-
-	U8 sim_access = region->getSimAccess();
-	switch(sim_access)
-	{
-	case SIM_ACCESS_PG:
-		mMaturityIcon->setValue(mIconMaturityGeneral->getName());
-		mMaturityIcon->setVisible(TRUE);
-		break;
-
-	case SIM_ACCESS_ADULT:
-		mMaturityIcon->setValue(mIconMaturityAdult->getName());
-		mMaturityIcon->setVisible(TRUE);
-		break;
-
-	default:
-		mMaturityIcon->setVisible(FALSE);
-	}
-
-	if (mMaturityIcon->getVisible())
-	{
-		positionMaturityIcon();
-	}
+	refreshMaturityIcon();
 }
 
 // returns new right edge
@@ -878,6 +853,36 @@ void LLLocationInputCtrl::refreshHealth()
 	}
 }
 
+void LLLocationInputCtrl::refreshMaturityIcon()
+{
+	// Updating maturity rating icon.
+	LLViewerRegion* region = gAgent.getRegion();
+	if (!region)
+		return;
+
+	U8 sim_access = region->getSimAccess();
+	switch(sim_access)
+	{
+	case SIM_ACCESS_PG:
+		mMaturityIcon->setValue(mIconMaturityGeneral->getName());
+		mMaturityIcon->setVisible(TRUE);
+		break;
+
+	case SIM_ACCESS_ADULT:
+		mMaturityIcon->setValue(mIconMaturityAdult->getName());
+		mMaturityIcon->setVisible(TRUE);
+		break;
+
+	default:
+		mMaturityIcon->setVisible(FALSE);
+	}
+
+	if (mMaturityIcon->getVisible())
+	{
+		positionMaturityIcon();
+	}
+}
+
 void LLLocationInputCtrl::positionMaturityIcon()
 {
 	const LLFontGL* font = mTextEntry->getFont();