diff options
| author | Palmer <palmer@lindenlab.com> | 2010-02-17 17:12:58 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-02-17 17:12:58 -0800 |
| commit | 3ef0d029ca06c991abcde2d59cd8d9478127b980 (patch) | |
| tree | 74e169c45c506ed01ec4cfe41c86f3b798a199ad /indra/newview/llviewertexturelist.cpp | |
| parent | e938d055f427275005d538bf09d3b40e0f680d5f (diff) | |
| parent | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index ee934ab9c5..7265ee60b1 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1497,7 +1497,7 @@ struct UIImageDeclarations : public LLInitParam::Block<UIImageDeclarations> bool LLUIImageList::initFromFile() { // construct path to canonical textures.xml in default skin dir - std::string base_file_path = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", "textures.xml"); + std::string base_file_path = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "base", "textures", "textures.xml"); LLXMLNodePtr root; |