aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2010-09-03 21:27:14 -0500
committerMcCabe Maxsted2010-09-03 23:21:12 -0700
commit3836f17ec00d5daf6e1a29e48d95bdd51448ef67 (patch)
tree54c2845d1dcee390805b50b50bd2b75f6daa5598
parentFixed other instances of 'www.imprudenceviewer.org'. There is no www. (diff)
downloadmeta-impy-3836f17ec00d5daf6e1a29e48d95bdd51448ef67.zip
meta-impy-3836f17ec00d5daf6e1a29e48d95bdd51448ef67.tar.gz
meta-impy-3836f17ec00d5daf6e1a29e48d95bdd51448ef67.tar.bz2
meta-impy-3836f17ec00d5daf6e1a29e48d95bdd51448ef67.tar.xz
Preload default avatar eyes and hair textures.
This is a temporary bandaid, it should not be necessary if everything was working like it should.
-rw-r--r--linden/indra/newview/llviewerimagelist.cpp22
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
174static std::string get_texture_list_name() 194static std::string get_texture_list_name()