diff options
author | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:36:30 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:36:30 -0400 |
commit | 176b8861742e3f80eddbf4d15b9cb21390b21088 (patch) | |
tree | 783fad5e2fdb9737652b791ec4b97ed1eeec35ca /indra/newview/CMakeLists.txt | |
parent | d2fa5a53e8b91bd0aba10ab3917c722dc360b610 (diff) | |
parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) |
merge changes for 5.1.5-release
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 6b3db36efe..ba261c8e91 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -535,6 +535,7 @@ set(viewer_SOURCE_FILES llscriptfloater.cpp llscrollingpanelparam.cpp llscrollingpanelparambase.cpp + llsculptidsize.cpp llsearchcombobox.cpp llsearchhistory.cpp llsecapi.cpp @@ -1148,6 +1149,7 @@ set(viewer_HEADER_FILES llscriptruntimeperms.h llscrollingpanelparam.h llscrollingpanelparambase.h + llsculptidsize.h llsearchcombobox.h llsearchhistory.h llsecapi.h |