diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
| commit | 890ec637d41330a2a91d23b09b6aaaf49738d19a (patch) | |
| tree | b093f98112fb0cfdcad5452df1b266f1e0052fc0 /indra/newview/llviewertexturelist.cpp | |
| parent | 1d1e4c7abe5c46cfafbc351e8cad3197d2befefc (diff) | |
| parent | 4ab945c9f0000ead1eca22eefe0829bf3c15d7da (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
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; |