aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerimagelist.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:55 -0500
committerJacek Antonelli2008-08-15 23:45:55 -0500
commit9063e60aefe54f7c45aaa8cb24e8998b2c7343ab (patch)
tree1c8235465701c910a5d76448ddc8eb1f14457ebc /linden/indra/newview/llviewerimagelist.cpp
parentSecond Life viewer sources 1.20.9 (diff)
downloadmeta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.zip
meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.tar.gz
meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.tar.bz2
meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.tar.xz
Second Life viewer sources 1.20.10
Diffstat (limited to 'linden/indra/newview/llviewerimagelist.cpp')
-rw-r--r--linden/indra/newview/llviewerimagelist.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 44c592a..384de83 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -144,7 +144,7 @@ void LLViewerImageList::doPreloadImages()
144 image = getImageFromFile("noentrypasslines.j2c", MIPMAP_YES, IMMEDIATE_YES); 144 image = getImageFromFile("noentrypasslines.j2c", MIPMAP_YES, IMMEDIATE_YES);
145 if (image) 145 if (image)
146 { 146 {
147 image->setClamp(FALSE, FALSE); 147 image->setClamp(FALSE, FALSE);
148 mImagePreloads.insert(image); 148 mImagePreloads.insert(image);
149 } 149 }
150 image = getImage(DEFAULT_WATER_NORMAL, MIPMAP_YES, IMMEDIATE_YES); 150 image = getImage(DEFAULT_WATER_NORMAL, MIPMAP_YES, IMMEDIATE_YES);
@@ -153,6 +153,13 @@ void LLViewerImageList::doPreloadImages()
153 image->setClamp(FALSE, FALSE); 153 image->setClamp(FALSE, FALSE);
154 mImagePreloads.insert(image); 154 mImagePreloads.insert(image);
155 } 155 }
156 image = getImageFromFile("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c", MIPMAP_YES, IMMEDIATE_YES,0,0,LLUUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"));
157 if (image)
158 {
159 image->setClamp(FALSE, FALSE);
160 mImagePreloads.insert(image);
161 }
162
156} 163}
157 164
158static std::string get_texture_list_name() 165static std::string get_texture_list_name()