diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-04 21:17:04 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-04 21:17:04 -0800 |
| commit | 0dfc7f6145b0c179ee66dbc7539b7c3d9a68cc37 (patch) | |
| tree | 7cce8cf627609aec932923679fd811a671bd3b9c /indra/newview/CMakeLists.txt | |
| parent | f5b356a7d4b51fbf509926295cb38d3a1e8442e3 (diff) | |
| parent | 5a23bf50bcee13a5841f680b13ca480753d367a1 (diff) | |
Pull merge from lindenlab/viewer-acme
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rwxr-xr-x | 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 746991a6f0..b937d53bd8 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -229,6 +229,7 @@ set(viewer_SOURCE_FILES llfloatereditwater.cpp llfloaterenvironmentsettings.cpp llfloaterevent.cpp + llfloaterfacebook.cpp llfloaterflickr.cpp llfloaterfonttest.cpp llfloatergesture.cpp @@ -276,7 +277,6 @@ set(viewer_SOURCE_FILES llfloatersettingsdebug.cpp llfloatersidepanelcontainer.cpp llfloatersnapshot.cpp - llfloatersocial.cpp llfloatersounddevices.cpp llfloaterspellchecksettings.cpp llfloatertelehub.cpp @@ -821,6 +821,7 @@ set(viewer_HEADER_FILES llfloatereditwater.h llfloaterenvironmentsettings.h llfloaterevent.h + llfloaterfacebook.h llfloaterflickr.h llfloaterfonttest.h llfloatergesture.h @@ -868,7 +869,6 @@ set(viewer_HEADER_FILES llfloatersettingsdebug.h llfloatersidepanelcontainer.h llfloatersnapshot.h - llfloatersocial.h llfloatersounddevices.h llfloaterspellchecksettings.h llfloatertelehub.h |