aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerimagelist.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/llviewerimagelist.cpp
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerimagelist.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 456afdb..9da84fa 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2000-2007, Linden Research, Inc. 5 * Copyright (c) 2000-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -178,6 +179,7 @@ void LLViewerImageList::doPreloadImages()
178 preloadImage("inv_item_landmark_visited.tga", LLUUID::null, FALSE); 179 preloadImage("inv_item_landmark_visited.tga", LLUUID::null, FALSE);
179 preloadImage("inv_item_notecard.tga", LLUUID::null, FALSE); 180 preloadImage("inv_item_notecard.tga", LLUUID::null, FALSE);
180 preloadImage("inv_item_object.tga", LLUUID::null, FALSE); 181 preloadImage("inv_item_object.tga", LLUUID::null, FALSE);
182 preloadImage("inv_item_object_multi.tga", LLUUID::null, FALSE);
181 preloadImage("inv_item_pants.tga", LLUUID::null, FALSE); 183 preloadImage("inv_item_pants.tga", LLUUID::null, FALSE);
182 preloadImage("inv_item_script.tga", LLUUID::null, FALSE); 184 preloadImage("inv_item_script.tga", LLUUID::null, FALSE);
183 preloadImage("inv_item_shape.tga", LLUUID::null, FALSE); 185 preloadImage("inv_item_shape.tga", LLUUID::null, FALSE);
@@ -243,6 +245,7 @@ void LLViewerImageList::doPreloadImages()
243 preloadImage("resize_handle_bottom_right_blue.tga", LLUUID::null, FALSE); 245 preloadImage("resize_handle_bottom_right_blue.tga", LLUUID::null, FALSE);
244 preloadImage("rounded_square.tga", LLUUID::null, FALSE); 246 preloadImage("rounded_square.tga", LLUUID::null, FALSE);
245 preloadImage("rounded_square_soft.tga", LLUUID::null, FALSE); 247 preloadImage("rounded_square_soft.tga", LLUUID::null, FALSE);
248 preloadImage("script_error.tga", LLUUID::null, TRUE);
246 preloadImage("scrollbutton_down_in_blue.tga", LLUUID::null, FALSE); 249 preloadImage("scrollbutton_down_in_blue.tga", LLUUID::null, FALSE);
247 preloadImage("scrollbutton_down_out_blue.tga", LLUUID::null, FALSE); 250 preloadImage("scrollbutton_down_out_blue.tga", LLUUID::null, FALSE);
248 preloadImage("scrollbutton_left_in_blue.tga", LLUUID::null, FALSE); 251 preloadImage("scrollbutton_left_in_blue.tga", LLUUID::null, FALSE);