diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-07 17:08:48 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-07 17:08:48 -0400 |
commit | 52194cac67d1ca7b96957895447202af7d870091 (patch) | |
tree | ffa63c5a880a97f0e3ba83cec3d477d9eec11ef9 /indra/newview/CMakeLists.txt | |
parent | e9fdbadea57686e89a4070e7bc3462b9cc7b06a4 (diff) | |
parent | 085b2c24f9ded3d0e9a33500a287aaa53e8b7fba (diff) |
automated merge
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 7dbe650625..035e9ddd9c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -215,6 +215,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 llpaneltopinfobar.cpp llpanelvolume.cpp llpanelvolumepulldown.cpp @@ -736,6 +738,7 @@ set(viewer_HEADER_FILES llfloaterurldisplay.h llfloaterurlentry.h llfloatervoicedevicesettings.h + llfloatervoiceeffect.h llfloaterwater.h llfloaterwhitelistentry.h llfloaterwindlight.h @@ -872,6 +875,7 @@ set(viewer_HEADER_FILES llpanelprofileview.h llpanelteleporthistory.h llpaneltiptoast.h + llpanelvoiceeffect.h llpaneltopinfobar.h llpanelvolume.h llpanelvolumepulldown.h |