From a8a62201ba762e98dff92cf49033e577fc34d8d4 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:45:27 -0500 Subject: Second Life viewer sources 1.19.0.0 --- linden/indra/newview/llviewerimagelist.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'linden/indra/newview/llviewerimagelist.h') diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h index 8ee2731..306dd5b 100644 --- a/linden/indra/newview/llviewerimagelist.h +++ b/linden/indra/newview/llviewerimagelist.h @@ -12,12 +12,12 @@ * ("GPL"), unless you have obtained a separate licensing agreement * ("Other License"), formally executed by you and Linden Lab. Terms of * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlife.com/developers/opensource/gplv2 + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 * * There are special exceptions to the terms and conditions of the GPL as * it is applied to this Source Code. View the full text of the exception * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at http://secondlife.com/developers/opensource/flossexception + * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception * * By copying, modifying or distributing this software, you acknowledge * that you have read and understood your obligations described above, @@ -37,6 +37,7 @@ #include "llgl.h" #include "llstat.h" #include "llviewerimage.h" +#include "llui.h" #include #include @@ -81,7 +82,8 @@ public: ~LLViewerImageList(); // LLImageProviderInterface - LLImageGL* getUIImageByID(const LLUUID& id, BOOL clamped = TRUE); + LLImageGL* getImageByID(const LLUUID& id, BOOL clamped = TRUE); + LLUIImage* getUIImageByID(const LLUUID& id, BOOL clamped = TRUE); void init(); void shutdown(); @@ -151,7 +153,7 @@ public: void doPrefetchImages(); private: - LLViewerImage* preloadImage(const LLString& filename, const LLUUID &image_set_id, BOOL use_mips); + LLViewerImage* preloadUIImage(const LLString& filename, const LLUUID &image_set_id, BOOL use_mips, const LLRectf& scale_rect = LLRectf(0.f, 1.f, 1.f, 0.f)); void updateImagesDecodePriorities(); F32 updateImagesCreateTextures(F32 max_time); F32 updateImagesFetchTextures(F32 max_time); @@ -190,7 +192,8 @@ private: LLUUID mMovieImageUUID; U8 mMovieImageHasMips; - std::vector > mPreloadedImages; + typedef std::map< LLUUID, LLPointer > uuid_ui_image_map_t; + uuid_ui_image_map_t mUIImages; public: static U32 sTextureBits; -- cgit v1.1