diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-08-11 11:54:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-08-11 11:54:57 -0400 |
| commit | 1f23f5a65b3634be39815f853cc008a8b5ad833e (patch) | |
| tree | af5f60fafb3b6af5225136a4effe3025e4ad09a6 /indra/newview/CMakeLists.txt | |
| parent | 71a468c6fb52f2f2cc7ebd17e548e9eaf3a875a5 (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
merge changes for 3.8.2-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 622949a140..b5a6912da0 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -268,6 +268,7 @@ set(viewer_SOURCE_FILES llfloaterland.cpp llfloaterlandholdings.cpp llfloaterloadprefpreset.cpp + llfloatermarketplacelistings.cpp llfloatermap.cpp llfloatermediasettings.cpp llfloatermemleak.cpp @@ -892,6 +893,7 @@ set(viewer_HEADER_FILES llfloaterlandholdings.h llfloaterloadprefpreset.h llfloatermap.h + llfloatermarketplacelistings.h llfloatermediasettings.h llfloatermemleak.h llfloatermodelpreview.h |