merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index b961053799..706587abb0 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1037,19 +1037,21 @@ void LLTextureCtrl::setVisible( BOOL visible )
 
 void LLTextureCtrl::setEnabled( BOOL enabled )
 {
+	LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)LLFloater::getFloaterByHandle(mFloaterHandle);
 	if( enabled )
 	{
-		setToolTip( "Click to choose a picture" );
+		LLString tooltip;
+		if (floaterp) tooltip = floaterp->getUIString("choose_picture");
+		setToolTip( tooltip );
 	}
 	else
 	{
-		setToolTip( "" );
+		setToolTip( LLString() );
 		// *TODO: would be better to keep floater open and show
 		// disabled state.
 		closeFloater();
 	}
 
-	LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)LLFloater::getFloaterByHandle(mFloaterHandle);
 	if( floaterp )
 	{
 		floaterp->setActive(enabled);