diff options
| author | McCabe Maxsted | 2010-08-01 22:34:31 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-01 22:34:31 -0700 |
| commit | c26674566b771ba14cbf64e55eb8a8d6c708800a (patch) | |
| tree | d59af27af888edc8fb68daf1d75e21b6dda45e5b /linden/indra/newview/CMakeLists.txt | |
| parent | Added loading kdu debugging info to the log (diff) | |
| parent | Added first use grid selector for selecting the default grid when Imprudence ... (diff) | |
| download | meta-impy-c26674566b771ba14cbf64e55eb8a8d6c708800a.zip meta-impy-c26674566b771ba14cbf64e55eb8a8d6c708800a.tar.gz meta-impy-c26674566b771ba14cbf64e55eb8a8d6c708800a.tar.bz2 meta-impy-c26674566b771ba14cbf64e55eb8a8d6c708800a.tar.xz | |
Merge branch '1.3-fRC1-firstusegrid' into weekly
Diffstat (limited to 'linden/indra/newview/CMakeLists.txt')
| -rw-r--r-- | linden/indra/newview/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index a5f2cbb..f531e11 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
| @@ -69,6 +69,7 @@ set(viewer_SOURCE_FILES | |||
| 69 | emeraldboobutils.cpp | 69 | emeraldboobutils.cpp |
| 70 | floaterao.cpp | 70 | floaterao.cpp |
| 71 | floaterbusy.cpp | 71 | floaterbusy.cpp |
| 72 | floatergriddefault.cpp | ||
| 72 | floatergridmanager.cpp | 73 | floatergridmanager.cpp |
| 73 | hbfloatergrouptitles.cpp | 74 | hbfloatergrouptitles.cpp |
| 74 | hippoGridManager.cpp | 75 | hippoGridManager.cpp |
| @@ -500,6 +501,7 @@ set(viewer_HEADER_FILES | |||
| 500 | emeraldboobutils.h | 501 | emeraldboobutils.h |
| 501 | floaterao.h | 502 | floaterao.h |
| 502 | floaterbusy.h | 503 | floaterbusy.h |
| 504 | floatergriddefault.h | ||
| 503 | floatergridmanager.h | 505 | floatergridmanager.h |
| 504 | hbfloatergrouptitles.h | 506 | hbfloatergrouptitles.h |
| 505 | hippoGridManager.h | 507 | hippoGridManager.h |
| @@ -1130,6 +1132,7 @@ set(viewer_XUI_FILES | |||
| 1130 | skins/default/xui/en-us/floater_font_test.xml | 1132 | skins/default/xui/en-us/floater_font_test.xml |
| 1131 | skins/default/xui/en-us/floater_gesture.xml | 1133 | skins/default/xui/en-us/floater_gesture.xml |
| 1132 | skins/default/xui/en-us/floater_god_tools.xml | 1134 | skins/default/xui/en-us/floater_god_tools.xml |
| 1135 | skins/default/xui/en-us/floater_grid_default_selector.xml | ||
| 1133 | skins/default/xui/en-us/floater_grid_manager.xml | 1136 | skins/default/xui/en-us/floater_grid_manager.xml |
| 1134 | skins/default/xui/en-us/floater_group_info.xml | 1137 | skins/default/xui/en-us/floater_group_info.xml |
| 1135 | skins/default/xui/en-us/floater_group_titles.xml | 1138 | skins/default/xui/en-us/floater_group_titles.xml |