diff options
author | Rider Linden <rider@lindenlab.com> | 2018-08-03 16:19:47 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-08-03 16:19:47 -0700 |
commit | 56c773b3bc52d72a5a7056d6eb9ce014dedbc0d8 (patch) | |
tree | e9c39e4c9255a909ce0996b4cf228d562020fddb /indra/newview/CMakeLists.txt | |
parent | 8779b29487dd3d18220b17be8dd501ffeabe274f (diff) | |
parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) |
Merge
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 5dd0c15a5f..e80bb5f4a5 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -200,6 +200,7 @@ set(viewer_SOURCE_FILES llflickrconnect.cpp llfloaterabout.cpp llfloaterbvhpreview.cpp + llfloaterauction.cpp llfloaterautoreplacesettings.cpp llfloateravatar.cpp llfloateravatarpicker.cpp @@ -820,6 +821,7 @@ set(viewer_HEADER_FILES llflickrconnect.h llfloaterabout.h llfloaterbvhpreview.h + llfloaterauction.h llfloaterautoreplacesettings.h llfloateravatar.h llfloateravatarpicker.h |