From 3836f17ec00d5daf6e1a29e48d95bdd51448ef67 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 3 Sep 2010 21:27:14 -0500
Subject: Preload default avatar eyes and hair textures.

This is a temporary bandaid, it should not be necessary if everything
was working like it should.
---
 linden/indra/newview/llviewerimagelist.cpp | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

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()
 		image->setAddressMode(LLTexUnit::TAM_WRAP);
 		mImagePreloads.insert(image);
 	}
-	
+
+	std::string id;
+
+	// Preload default avatar eyes
+	id = gSavedSettings.getString("UIImgDefaultEyesUUID");
+	image = getImageFromFile(id+".j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,LLUUID(id));
+	if (image)
+	{
+		image->setAddressMode(LLTexUnit::TAM_WRAP);
+		mImagePreloads.insert(image);
+	}
+
+	// Preload default avatar hair
+	id = gSavedSettings.getString("UIImgDefaultHairUUID");
+	image = getImageFromFile(id+".j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,LLUUID(id));
+	if (image)
+	{
+		image->setAddressMode(LLTexUnit::TAM_WRAP);
+		mImagePreloads.insert(image);
+	}
+
 }
 
 static std::string get_texture_list_name()
-- 
cgit v1.1