diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-05-19 16:28:24 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-19 16:28:24 +0100 |
commit | cb6b6b1b4fbca54f1c473ab730cf3481c1965ebe (patch) | |
tree | b6eeecfc25e32ad8b6dec0eecf065a48a42e6d97 /indra/newview/CMakeLists.txt | |
parent | b550bb0f09197c35b80d18d540761a7831c3e89b (diff) | |
parent | 95ed59a9dec737ffe8d566595e1a74f662fe1e43 (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 d77d53f6af..fd12322d37 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -214,6 +214,7 @@ set(viewer_SOURCE_FILES llfloaterurldisplay.cpp llfloaterurlentry.cpp llfloatervoicedevicesettings.cpp + llfloatervoiceeffect.cpp llfloaterwater.cpp llfloaterwhitelistentry.cpp llfloaterwindlight.cpp @@ -352,6 +353,7 @@ set(viewer_SOURCE_FILES llpanelprofileview.cpp llpanelteleporthistory.cpp llpaneltiptoast.cpp + llpanelvoiceeffect.cpp llpanelvolume.cpp llpanelvolumepulldown.cpp llparcelselection.cpp @@ -729,6 +731,7 @@ set(viewer_HEADER_FILES llfloaterurldisplay.h llfloaterurlentry.h llfloatervoicedevicesettings.h + llfloatervoiceeffect.h llfloaterwater.h llfloaterwhitelistentry.h llfloaterwindlight.h @@ -862,6 +865,7 @@ set(viewer_HEADER_FILES llpanelprofileview.h llpanelteleporthistory.h llpaneltiptoast.h + llpanelvoiceeffect.h llpanelvolume.h llpanelvolumepulldown.h llparcelselection.h |