diff options
| author | Richard Linden <none@none> | 2010-02-17 15:16:31 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-02-17 15:16:31 -0800 |
| commit | effadd3908c53f17ced08131546196e3dea9d1d5 (patch) | |
| tree | c6d6ffa34630b26fec962ac42eeaf18fa9d0f22a /indra/newview/llviewertexturelist.cpp | |
| parent | 1c0603bef2bac6e006df7566aa2a3f8c351a1b7f (diff) | |
| parent | 366aa236f2964855bcb6f8b95f52e8bdad902651 (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; |