diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-05-27 12:54:55 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-27 12:54:55 +0100 |
commit | 617a80ee81cd1c8514594854036f6f543a571e95 (patch) | |
tree | 56862ffa417c8e3545f5c377ad7c576bc003f83e /indra/newview/CMakeLists.txt | |
parent | 63200e2a5bfc7538fd8114464000f35798670f23 (diff) | |
parent | 485f9abde6b728a923070e392e40c16ea9f05226 (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index dad2c615e3..65836d9eb7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -216,6 +216,7 @@ set(viewer_SOURCE_FILES llfloaterurldisplay.cpp llfloaterurlentry.cpp llfloatervoicedevicesettings.cpp + llfloatervoiceeffect.cpp llfloaterwater.cpp llfloaterwhitelistentry.cpp llfloaterwindlight.cpp @@ -356,6 +357,7 @@ set(viewer_SOURCE_FILES llpanelprofileview.cpp llpanelteleporthistory.cpp llpaneltiptoast.cpp + llpanelvoiceeffect.cpp llpanelvolume.cpp llpanelvolumepulldown.cpp llparcelselection.cpp @@ -734,6 +736,7 @@ set(viewer_HEADER_FILES llfloaterurldisplay.h llfloaterurlentry.h llfloatervoicedevicesettings.h + llfloatervoiceeffect.h llfloaterwater.h llfloaterwhitelistentry.h llfloaterwindlight.h @@ -869,6 +872,7 @@ set(viewer_HEADER_FILES llpanelprofileview.h llpanelteleporthistory.h llpaneltiptoast.h + llpanelvoiceeffect.h llpanelvolume.h llpanelvolumepulldown.h llparcelselection.h |