diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-18 18:39:56 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-18 18:39:56 -0800 |
| commit | e9056ef59ddc7eec7d948b4f7cbf54220f1e3499 (patch) | |
| tree | 15c3a0eca87f2912d1f67cb085b3706810a3a98e /indra/newview/llviewertexturelist.cpp | |
| parent | 363f4e877c0a3c7cac15b23645afb8d9337f1b6f (diff) | |
| parent | e0249da7fd8af278b286b444da96fd2b5a54354e (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 7265ee60b1..ee934ab9c5 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, "base", "textures", "textures.xml"); + std::string base_file_path = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", "textures.xml"); LLXMLNodePtr root; |