From b045d9bd96bf2c757a1251e3777894864018924e Mon Sep 17 00:00:00 2001 From: Shyotl Date: Mon, 30 Jan 2012 03:28:35 -0600 Subject: [PATCH] Precache a few more inventory icons. --- indra/newview/llvovolume.cpp | 2 +- .../skins/Pony-Aquablue/textures/textures.xml | 3 +++ .../skins/Pony-Purple/textures/textures.xml | 3 +++ indra/newview/skins/dark/textures/textures.xml | 3 +++ .../newview/skins/darkgred/textures/textures.xml | 3 +++ .../skins/darkorange/textures/textures.xml | 3 +++ .../skins/default/textures/inv_item_mesh.tga | Bin 0 -> 749 bytes indra/newview/skins/default/textures/textures.xml | 3 +++ indra/newview/skins/emerald/textures/textures.xml | 3 +++ indra/newview/skins/gemini/textures/textures.xml | 3 +++ indra/newview/skins/gred/textures/textures.xml | 3 +++ indra/newview/skins/kdarknv/textures/textures.xml | 3 +++ indra/newview/skins/kliteat/textures/textures.xml | 3 +++ .../newview/skins/openlife/textures/textures.xml | 3 +++ .../newview/skins/pslgreen/textures/textures.xml | 3 +++ .../newview/skins/pslpurple/textures/textures.xml | 3 +++ indra/newview/skins/wisdom/textures/textures.xml | 3 +++ 17 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/inv_item_mesh.tga diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 4280821c4..c6e57e97b 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -821,7 +821,7 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms_in, const S32 detail, bo if (is404) { - setIcon(LLViewerTextureManager::getFetchedTextureFromFile("icons/Inv_Mesh.png", TRUE, LLViewerTexture::BOOST_UI)); + setIcon(LLViewerTextureManager::getFetchedTextureFromFile("inv_item_mesh.tga", TRUE, LLViewerTexture::BOOST_UI)); //render prim proxy when mesh loading attempts give up volume_params.setSculptID(LLUUID::null, LL_SCULPT_TYPE_NONE); diff --git a/indra/newview/skins/Pony-Aquablue/textures/textures.xml b/indra/newview/skins/Pony-Aquablue/textures/textures.xml index 70cd3e113..41fe7a9f9 100644 --- a/indra/newview/skins/Pony-Aquablue/textures/textures.xml +++ b/indra/newview/skins/Pony-Aquablue/textures/textures.xml @@ -130,6 +130,9 @@ + + + diff --git a/indra/newview/skins/Pony-Purple/textures/textures.xml b/indra/newview/skins/Pony-Purple/textures/textures.xml index 70cd3e113..41fe7a9f9 100644 --- a/indra/newview/skins/Pony-Purple/textures/textures.xml +++ b/indra/newview/skins/Pony-Purple/textures/textures.xml @@ -130,6 +130,9 @@ + + + diff --git a/indra/newview/skins/dark/textures/textures.xml b/indra/newview/skins/dark/textures/textures.xml index 4dbbdf01b..451b70062 100644 --- a/indra/newview/skins/dark/textures/textures.xml +++ b/indra/newview/skins/dark/textures/textures.xml @@ -154,6 +154,9 @@ + + + diff --git a/indra/newview/skins/darkgred/textures/textures.xml b/indra/newview/skins/darkgred/textures/textures.xml index 4dbbdf01b..451b70062 100644 --- a/indra/newview/skins/darkgred/textures/textures.xml +++ b/indra/newview/skins/darkgred/textures/textures.xml @@ -154,6 +154,9 @@ + + + diff --git a/indra/newview/skins/darkorange/textures/textures.xml b/indra/newview/skins/darkorange/textures/textures.xml index 70cd3e113..41fe7a9f9 100644 --- a/indra/newview/skins/darkorange/textures/textures.xml +++ b/indra/newview/skins/darkorange/textures/textures.xml @@ -130,6 +130,9 @@ + + + diff --git a/indra/newview/skins/default/textures/inv_item_mesh.tga b/indra/newview/skins/default/textures/inv_item_mesh.tga new file mode 100644 index 0000000000000000000000000000000000000000..b6fad44b20a5e6c1ab811dafd912afa328a43838 GIT binary patch literal 749 zcmYL{OK4L;6o#+&dNpai1-&Y97)8m;=- znyuA4t^?40x;zJ!rE{()`^iNzL%xw^0@Jdg8wLvENahlm zBk5XQ*I$s|jKW;!f)#1OrtUs8oXTPQ#5BU^#^Ku0314~`&bru22`aT8E)FlHYUpGJ z@yS^vrruyz`4dv*1++b0M8lZ^Hg@!(`N~r?Wu_1q%);8%25tvxzpv&HA-~)^JCJ<% z9?1vqke4csRAm9d{`2tm97nWJMpO14Vwa!5({)6o!U>VfH%JgjpGB(jr7ACfhVQ@t zHunxAlAl&3g2!^~fhp44B2%5S#M5;HvFxP!Z*_)8AK}@12!VktqGJ_=M@w*cgQ8p{ z8_0^fmWG>rb^1ey-GNY&kuFSaAk+>poHbCEaRIxde4(?VOiA?FUuU zTJOAqt7SJDM@sM?9ubLfRb^kIrQSnM!r`GJ5_exSeGfuI*I>H6k~&Xn{->{{D=nHe zUF#9Oa1(aC6V}$0r2ZjsRaCt+lWv$SIXpfXmRp{Pq>ZZ8A}v+vDCg?ZGunn)9+zca Usa_&KX*Vi?3a_HOhWM5D5Aaji^8f$< literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index c7929b058..973f76923 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -133,6 +133,9 @@ + + + diff --git a/indra/newview/skins/emerald/textures/textures.xml b/indra/newview/skins/emerald/textures/textures.xml index 9e1d9b519..8ccd5fa5d 100644 --- a/indra/newview/skins/emerald/textures/textures.xml +++ b/indra/newview/skins/emerald/textures/textures.xml @@ -130,6 +130,9 @@ + + + diff --git a/indra/newview/skins/gemini/textures/textures.xml b/indra/newview/skins/gemini/textures/textures.xml index 2c4b0cbea..792f6a453 100644 --- a/indra/newview/skins/gemini/textures/textures.xml +++ b/indra/newview/skins/gemini/textures/textures.xml @@ -130,6 +130,9 @@ + + + diff --git a/indra/newview/skins/gred/textures/textures.xml b/indra/newview/skins/gred/textures/textures.xml index 4dbbdf01b..451b70062 100644 --- a/indra/newview/skins/gred/textures/textures.xml +++ b/indra/newview/skins/gred/textures/textures.xml @@ -154,6 +154,9 @@ + + + diff --git a/indra/newview/skins/kdarknv/textures/textures.xml b/indra/newview/skins/kdarknv/textures/textures.xml index 07c74c2b1..d26f9ccb4 100644 --- a/indra/newview/skins/kdarknv/textures/textures.xml +++ b/indra/newview/skins/kdarknv/textures/textures.xml @@ -130,6 +130,9 @@ + + + diff --git a/indra/newview/skins/kliteat/textures/textures.xml b/indra/newview/skins/kliteat/textures/textures.xml index 82e990837..195b13f42 100644 --- a/indra/newview/skins/kliteat/textures/textures.xml +++ b/indra/newview/skins/kliteat/textures/textures.xml @@ -134,6 +134,9 @@ + + + diff --git a/indra/newview/skins/openlife/textures/textures.xml b/indra/newview/skins/openlife/textures/textures.xml index 7adbcd402..b3b964c2e 100644 --- a/indra/newview/skins/openlife/textures/textures.xml +++ b/indra/newview/skins/openlife/textures/textures.xml @@ -134,6 +134,9 @@ + + + diff --git a/indra/newview/skins/pslgreen/textures/textures.xml b/indra/newview/skins/pslgreen/textures/textures.xml index 4dbbdf01b..451b70062 100644 --- a/indra/newview/skins/pslgreen/textures/textures.xml +++ b/indra/newview/skins/pslgreen/textures/textures.xml @@ -154,6 +154,9 @@ + + + diff --git a/indra/newview/skins/pslpurple/textures/textures.xml b/indra/newview/skins/pslpurple/textures/textures.xml index 4dbbdf01b..451b70062 100644 --- a/indra/newview/skins/pslpurple/textures/textures.xml +++ b/indra/newview/skins/pslpurple/textures/textures.xml @@ -154,6 +154,9 @@ + + + diff --git a/indra/newview/skins/wisdom/textures/textures.xml b/indra/newview/skins/wisdom/textures/textures.xml index 34c9dea7e..550ea5ff1 100644 --- a/indra/newview/skins/wisdom/textures/textures.xml +++ b/indra/newview/skins/wisdom/textures/textures.xml @@ -130,6 +130,9 @@ + + +