diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-05-26 14:43:48 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-26 14:43:48 +0100 |
commit | 7ab53a6eec2617357ad6d7e7b2f2a3879a663124 (patch) | |
tree | 540549364526ececfe2c2a8e5c53d14b7e00a48f /indra/newview/CMakeLists.txt | |
parent | 14418c197076d0eb01bb0852b8716fa966bc9d53 (diff) | |
parent | 3c7df727eeb10a1e6adf27b7aa352afddfcd5d6d (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 ddd5d47e78..f7f5f4c337 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 @@ -735,6 +737,7 @@ set(viewer_HEADER_FILES llfloaterurldisplay.h llfloaterurlentry.h llfloatervoicedevicesettings.h + llfloatervoiceeffect.h llfloaterwater.h llfloaterwhitelistentry.h llfloaterwindlight.h @@ -870,6 +873,7 @@ set(viewer_HEADER_FILES llpanelprofileview.h llpanelteleporthistory.h llpaneltiptoast.h + llpanelvoiceeffect.h llpanelvolume.h llpanelvolumepulldown.h llparcelselection.h |