diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-08-17 16:00:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-08-17 16:00:04 -0400 |
| commit | fe2eefd9139a860cd9ffa67ee5f148ba3922320c (patch) | |
| tree | d0395a805b44f525a5614bb2b3489d944555c170 /indra/newview/CMakeLists.txt | |
| parent | 4fb66604c9767bf518575963e9d4a871800bdeb3 (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge changes for 3.8.3-release
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rwxr-xr-x | 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 ff04c4e0f3..179f2b3c46 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -267,6 +267,7 @@ set(viewer_SOURCE_FILES llfloaterlagmeter.cpp llfloaterland.cpp llfloaterlandholdings.cpp + llfloatermarketplacelistings.cpp llfloatermap.cpp llfloatermediasettings.cpp llfloatermemleak.cpp @@ -887,6 +888,7 @@ set(viewer_HEADER_FILES llfloaterland.h llfloaterlandholdings.h llfloatermap.h + llfloatermarketplacelistings.h llfloatermediasettings.h llfloatermemleak.h llfloatermodelpreview.h |