diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
commit | e0efa1dfa236f8a52a88212298b6e5113ef8f07a (patch) | |
tree | 9a94d26d308981d2070129147b9ba751118bdd76 /indra/newview/llfloateruipreview.cpp | |
parent | ef9b7c5b36c7521c4519e682aa312c4c25c31c2f (diff) | |
parent | 890ec637d41330a2a91d23b09b6aaaf49738d19a (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
-rw-r--r-- | indra/newview/llfloateruipreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index f086d72bd2..f61c86db14 100644 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -88,7 +88,7 @@ static LLDefaultChildRegistry::Register<LLOverlapPanel> register_overlap_panel(" static std::string get_xui_dir() { std::string delim = gDirUtilp->getDirDelimiter(); - return gDirUtilp->getSkinBaseDir() + delim + "base" + delim + "xui" + delim; + return gDirUtilp->getSkinBaseDir() + delim + "default" + delim + "xui" + delim; } // Forward declarations to avoid header dependencies |