diff options
| author | Jacek Antonelli | 2008-10-17 19:06:47 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 19:07:46 -0500 |
| commit | 8f50d81693ff9463ae49c36935977a2b70e6bf45 (patch) | |
| tree | c9cfff9baa90394b8a3866c5696c84352f19bba6 /linden/indra/newview/lltexturectrl.cpp | |
| parent | Fixed bad panel_overlay XML from a sloppy merge. (diff) | |
| parent | Second Life viewer sources 1.21.6 (diff) | |
| download | meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.zip meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.gz meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.bz2 meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.xz | |
Updated source to SL version 1.21.6.
Diffstat (limited to 'linden/indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | linden/indra/newview/lltexturectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp index 48cacf8..382a4f3 100644 --- a/linden/indra/newview/lltexturectrl.cpp +++ b/linden/indra/newview/lltexturectrl.cpp | |||
| @@ -1047,7 +1047,7 @@ void LLTextureCtrl::setEnabled( BOOL enabled ) | |||
| 1047 | if( enabled ) | 1047 | if( enabled ) |
| 1048 | { | 1048 | { |
| 1049 | std::string tooltip; | 1049 | std::string tooltip; |
| 1050 | if (floaterp) tooltip = floaterp->getUIString("choose_picture"); | 1050 | if (floaterp) tooltip = floaterp->getString("choose_picture"); |
| 1051 | setToolTip( tooltip ); | 1051 | setToolTip( tooltip ); |
| 1052 | } | 1052 | } |
| 1053 | else | 1053 | else |