diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llcolorswatch.cpp | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
| -rw-r--r-- | indra/newview/llcolorswatch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index 33aaac542b..31c2d93c05 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -48,10 +48,10 @@ #include "lltextbox.h" #include "llfloatercolorpicker.h" #include "llviewborder.h" -#include "llviewerimagelist.h" +#include "llviewertexturelist.h" #include "llfocusmgr.h" -static LLDefaultWidgetRegistry::Register<LLColorSwatchCtrl> r("color_swatch"); +static LLDefaultChildRegistry::Register<LLColorSwatchCtrl> r("color_swatch"); LLColorSwatchCtrl::Params::Params() : color("color", LLColor4::white), @@ -227,7 +227,7 @@ void LLColorSwatchCtrl::draw() { if (!mFallbackImageName.empty()) { - LLPointer<LLViewerImage> fallback_image = gImageList.getImageFromFile(mFallbackImageName); + LLPointer<LLViewerTexture> fallback_image = LLViewerTextureManager::getFetchedTextureFromFile(mFallbackImageName, TRUE, FALSE, LLViewerTexture::LOD_TEXTURE); if( fallback_image->getComponents() == 4 ) { gl_rect_2d_checkerboard( interior ); |