diff options
| author | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
| commit | 5866bb7ef09b786f8f195770a70dc4289d183ca0 (patch) | |
| tree | 0be3b5e63506bf30edd3748f9e31740ae9ebbaa8 /indra/newview/lltexturectrl.h | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
| parent | a8192fbf60540e42dcff5f1efb8bf8cafbfac484 (diff) | |
merge with release
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rwxr-xr-x | indra/newview/lltexturectrl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index ad79042ef1..15ca7bed92 100755 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -227,8 +227,4 @@ private: S32 mLabelWidth; }; -// XUI HACK: When floaters converted, switch this file to lltexturepicker.h/cpp -// and class to LLTexturePicker -#define LLTexturePicker LLTextureCtrl - #endif // LL_LLTEXTURECTRL_H |