diff options
author | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:36:30 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:36:30 +0300 |
commit | 01ba9f3cd69a40ddffcee84fda95460b0f87629e (patch) | |
tree | ebf28dd52bcbc8d53b5e833242c7f36b725b2ec3 /indra/newview/CMakeLists.txt | |
parent | 246758a3b70256f2c776d5372296b858251fd820 (diff) | |
parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) |
Merge downstream code and become version 3.8.3
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 3f45b06786..e8e9e3e897 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -266,6 +266,7 @@ set(viewer_SOURCE_FILES llfloaterlagmeter.cpp llfloaterland.cpp llfloaterlandholdings.cpp + llfloatermarketplacelistings.cpp llfloatermap.cpp llfloatermediasettings.cpp llfloatermemleak.cpp @@ -885,6 +886,7 @@ set(viewer_HEADER_FILES llfloaterland.h llfloaterlandholdings.h llfloatermap.h + llfloatermarketplacelistings.h llfloatermediasettings.h llfloatermemleak.h llfloatermodelpreview.h |