diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-04-19 16:27:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-04-19 16:27:38 -0400 |
| commit | 1b032c37833be3a03170a28b1955c55061936442 (patch) | |
| tree | f4500e347b6f18eeafe61217c4a9f884a8ebea34 /indra/newview/CMakeLists.txt | |
| parent | e07a60f6cc80d052377996b8c3ef9a9a20e20584 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
merge changes for 5.0.4-release
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 5945b0d3c3..bb161d6321 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -204,6 +204,7 @@ set(viewer_SOURCE_FILES llfloaterautoreplacesettings.cpp llfloateravatar.cpp llfloateravatarpicker.cpp + llfloateravatarrendersettings.cpp llfloateravatartextures.cpp llfloaterbeacons.cpp llfloaterbigpreview.cpp @@ -237,6 +238,7 @@ set(viewer_SOURCE_FILES llfloatergesture.cpp llfloatergodtools.cpp llfloatergotoline.cpp + llfloatergridstatus.cpp llfloatergroupbulkban.cpp llfloatergroupinvite.cpp llfloatergroups.cpp @@ -820,6 +822,7 @@ set(viewer_HEADER_FILES llfloaterautoreplacesettings.h llfloateravatar.h llfloateravatarpicker.h + llfloateravatarrendersettings.h llfloateravatartextures.h llfloaterbeacons.h llfloaterbigpreview.h @@ -853,6 +856,7 @@ set(viewer_HEADER_FILES llfloatergesture.h llfloatergodtools.h llfloatergotoline.h + llfloatergridstatus.h llfloatergroupbulkban.h llfloatergroupinvite.h llfloatergroups.h |