diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:58:48 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:58:48 +0000 |
| commit | 8ca1ace6510ba33c0b44b228fb5a58935320f2d0 (patch) | |
| tree | 67fd8ffab4b00deee7934db987210227d78098ad /indra/newview/llviewertexturelist.cpp | |
| parent | e09822153e135e8fc89f6fdb3338bb9e8e5b6132 (diff) | |
| parent | b71f451b76ef65c6afc29a9da8c0f5d0b40cd720 (diff) | |
viewer2 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; |