diff options
author | Dave Parks <davep@lindenlab.com> | 2010-04-14 12:12:03 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-04-14 12:12:03 -0500 |
commit | a7e1745bed2e8c22843b946700b4ae9c8fbf8ac9 (patch) | |
tree | 40d0b8bc9c5715f55e2870c5e2e4b534e01a774b /indra/newview/CMakeLists.txt | |
parent | 6b72149cf7ad90c0036d9b037594b0a8e86dc483 (diff) | |
parent | 168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (diff) |
Merge
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b80190a1d2..e6b266e0a7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -149,7 +149,6 @@ set(viewer_SOURCE_FILES llfirstuse.cpp llflexibleobject.cpp llfloaterabout.cpp - llfloateractivespeakers.cpp llfloateranimpreview.cpp llfloaterauction.cpp llfloateravatarpicker.cpp @@ -446,6 +445,7 @@ set(viewer_SOURCE_FILES lltracker.cpp lltransientdockablefloater.cpp lltransientfloatermgr.cpp + llpanelgenerictip.cpp lluilistener.cpp lluploaddialog.cpp llurl.cpp @@ -657,7 +657,6 @@ set(viewer_HEADER_FILES llfirstuse.h llflexibleobject.h llfloaterabout.h - llfloateractivespeakers.h llfloateranimpreview.h llfloaterauction.h llfloateravatarpicker.h @@ -952,6 +951,7 @@ set(viewer_HEADER_FILES lltracker.h lltransientdockablefloater.h lltransientfloatermgr.h + llpanelgenerictip.h lluiconstants.h lluilistener.h lluploaddialog.h |