diff options
author | Chuck Linden <chuck@lindenlab.com> | 2010-02-17 18:47:45 -0500 |
---|---|---|
committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-17 18:47:45 -0500 |
commit | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (patch) | |
tree | 492fd1d140180792bdae2ed3b00765b367b5e2d3 /indra/newview/CMakeLists.txt | |
parent | 50e696872ecebd37e8a43df3031e4cdaf26147a9 (diff) | |
parent | 0aaaa06fe0149ffbc22823daa095749be1abe3e0 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r-- | indra/newview/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 14eb75e457..ea1ec80ae7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1211,18 +1211,18 @@ endif (WINDOWS) # Add the xui files. This is handy for searching for xui elements # from within the IDE. set(viewer_XUI_FILES - skins/default/colors.xml - skins/default/textures/textures.xml + skins/base/colors.xml + skins/base/textures/textures.xml ) file(GLOB DEFAULT_XUI_FILE_GLOB_LIST - ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/xui/en/*.xml) + ${CMAKE_CURRENT_SOURCE_DIR}/skins/base/xui/en/*.xml) list(APPEND viewer_XUI_FILES ${DEFAULT_XUI_FILE_GLOB_LIST}) file(GLOB DEFAULT_WIDGET_FILE_GLOB_LIST - ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/xui/en/widgets/*.xml) + ${CMAKE_CURRENT_SOURCE_DIR}/skins/base/xui/en/widgets/*.xml) list(APPEND viewer_XUI_FILES ${DEFAULT_WIDGET_FILE_GLOB_LIST}) file(GLOB SILVER_XUI_FILE_GLOB_LIST |