diff options
author | Jacek Antonelli | 2008-09-28 13:56:00 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-28 19:55:41 -0500 |
commit | 9a4f5702473e7540cde1bbff2d7189d9ed71fd86 (patch) | |
tree | 53d52a965085be43c89ef45592a8198f7befc4be /linden/indra/newview/CMakeLists.txt | |
parent | Second Life viewer sources 1.21.2-RC (diff) | |
parent | Merge branch 'VWR-8341' into next-merge (diff) | |
download | meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.zip meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.gz meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.bz2 meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.xz |
Updated to SL source 1.21.2.
Conflicts:
linden/indra/SConstruct
linden/indra/newview/files.lst
linden/indra/newview/llfloatertools.cpp
linden/indra/newview/llfloatertools.h
linden/indra/newview/lloverlaybar.cpp
linden/indra/newview/lloverlaybar.h
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
linden/indra/newview/viewer_manifest.py
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 e93ea57..ae0feb6 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
@@ -124,6 +124,7 @@ set(viewer_SOURCE_FILES | |||
124 | llfloateravatarpicker.cpp | 124 | llfloateravatarpicker.cpp |
125 | llfloateravatartextures.cpp | 125 | llfloateravatartextures.cpp |
126 | llfloaterbuildoptions.cpp | 126 | llfloaterbuildoptions.cpp |
127 | llfloaterbulkpermission.cpp | ||
127 | llfloaterbump.cpp | 128 | llfloaterbump.cpp |
128 | llfloaterbuycontents.cpp | 129 | llfloaterbuycontents.cpp |
129 | llfloaterbuy.cpp | 130 | llfloaterbuy.cpp |
@@ -514,6 +515,7 @@ set(viewer_HEADER_FILES | |||
514 | llfloateravatarpicker.h | 515 | llfloateravatarpicker.h |
515 | llfloateravatartextures.h | 516 | llfloateravatartextures.h |
516 | llfloaterbuildoptions.h | 517 | llfloaterbuildoptions.h |
518 | llfloaterbulkpermission.h | ||
517 | llfloaterbump.h | 519 | llfloaterbump.h |
518 | llfloaterbuy.h | 520 | llfloaterbuy.h |
519 | llfloaterbuycontents.h | 521 | llfloaterbuycontents.h |
@@ -1019,6 +1021,7 @@ set(viewer_XUI_FILES | |||
1019 | skins/default/xui/en-us/floater_avatar_picker.xml | 1021 | skins/default/xui/en-us/floater_avatar_picker.xml |
1020 | skins/default/xui/en-us/floater_avatar_textures.xml | 1022 | skins/default/xui/en-us/floater_avatar_textures.xml |
1021 | skins/default/xui/en-us/floater_build_options.xml | 1023 | skins/default/xui/en-us/floater_build_options.xml |
1024 | skins/default/xui/en-us/floater_bulk_perms.xml | ||
1022 | skins/default/xui/en-us/floater_bumps.xml | 1025 | skins/default/xui/en-us/floater_bumps.xml |
1023 | skins/default/xui/en-us/floater_buy_contents.xml | 1026 | skins/default/xui/en-us/floater_buy_contents.xml |
1024 | skins/default/xui/en-us/floater_buy_currency.xml | 1027 | skins/default/xui/en-us/floater_buy_currency.xml |