diff options
Diffstat (limited to 'linden/indra/newview/llviewerimagelist.cpp')
-rw-r--r-- | linden/indra/newview/llviewerimagelist.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp index 518f6d4..703d233 100644 --- a/linden/indra/newview/llviewerimagelist.cpp +++ b/linden/indra/newview/llviewerimagelist.cpp | |||
@@ -168,7 +168,27 @@ void LLViewerImageList::doPreloadImages() | |||
168 | image->setAddressMode(LLTexUnit::TAM_WRAP); | 168 | image->setAddressMode(LLTexUnit::TAM_WRAP); |
169 | mImagePreloads.insert(image); | 169 | mImagePreloads.insert(image); |
170 | } | 170 | } |
171 | 171 | ||
172 | std::string id; | ||
173 | |||
174 | // Preload default avatar eyes | ||
175 | id = gSavedSettings.getString("UIImgDefaultEyesUUID"); | ||
176 | image = getImageFromFile(id+".j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,LLUUID(id)); | ||
177 | if (image) | ||
178 | { | ||
179 | image->setAddressMode(LLTexUnit::TAM_WRAP); | ||
180 | mImagePreloads.insert(image); | ||
181 | } | ||
182 | |||
183 | // Preload default avatar hair | ||
184 | id = gSavedSettings.getString("UIImgDefaultHairUUID"); | ||
185 | image = getImageFromFile(id+".j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,LLUUID(id)); | ||
186 | if (image) | ||
187 | { | ||
188 | image->setAddressMode(LLTexUnit::TAM_WRAP); | ||
189 | mImagePreloads.insert(image); | ||
190 | } | ||
191 | |||
172 | } | 192 | } |
173 | 193 | ||
174 | static std::string get_texture_list_name() | 194 | static std::string get_texture_list_name() |