From d725e5b24075b2171f8a5b263969991e9b475078 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 29 Sep 2008 19:14:50 +0000 Subject: QAR-872 Viewer 1.21 RC 3 merge viewer_1-21 96116-97380 -> release --- indra/newview/lltexturectrl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltexturectrl.cpp') diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 83b5cdbb66..4f9d9f7763 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1047,7 +1047,7 @@ void LLTextureCtrl::setEnabled( BOOL enabled ) if( enabled ) { std::string tooltip; - if (floaterp) tooltip = floaterp->getUIString("choose_picture"); + if (floaterp) tooltip = floaterp->getString("choose_picture"); setToolTip( tooltip ); } else -- cgit v1.2.3