diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-07-07 17:59:07 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-07-07 17:59:07 -0700 |
| commit | 76e7f978c157f9921593ea0e43f642cb9de4703d (patch) | |
| tree | ccc62865f26cb84cabbe9b65de23c4e1342aa142 /indra/newview/CMakeLists.txt | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
| parent | cf143bd4610dc279f1aa790e0b37fbad5c86f654 (diff) | |
Merge viewer up to 3.7.12, including fixing missed LL_WARNS etc from last release (is that trout you smell on the air? is it?)
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 142665525f..2b93be7e97 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -132,7 +132,6 @@ set(viewer_SOURCE_FILES llbreadcrumbview.cpp llbrowsernotification.cpp llbuycurrencyhtml.cpp - llcallbacklist.cpp llcallingcard.cpp llcapabilitylistener.cpp llcaphttpsender.cpp @@ -732,7 +731,6 @@ set(viewer_HEADER_FILES llbox.h llbreadcrumbview.h llbuycurrencyhtml.h - llcallbacklist.h llcallingcard.h llcapabilitylistener.h llcapabilityprovider.h @@ -987,6 +985,9 @@ set(viewer_HEADER_FILES llnameeditor.h llnamelistctrl.h llnavigationbar.h + llfloaterimnearbychat.h + llfloaterimnearbychathandler.h + llfloaterimnearbychatlistener.h llnetmap.h llnotificationhandler.h llnotificationmanager.h |