diff options
| author | Graham Linden <none@none> | 2014-09-25 09:20:01 -0700 |
|---|---|---|
| committer | Graham Linden <none@none> | 2014-09-25 09:20:01 -0700 |
| commit | 9f4788d7a8a924de654d55bfb102a81f797a9cf9 (patch) | |
| tree | 742fb8127dc84052265647ed110e8a6446253103 /indra/newview/CMakeLists.txt | |
| parent | 6004ad167458914c3b85438b96e81ea8796e368b (diff) | |
| parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) | |
Merge viewer-release 3.7.17
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index debf0eeca7..b7b7b88d35 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -251,6 +251,7 @@ set(viewer_SOURCE_FILES llfloaterinspect.cpp llfloaterinventory.cpp llfloaterjoystick.cpp + llfloaterlagmeter.cpp llfloaterland.cpp llfloaterlandholdings.cpp llfloatermap.cpp @@ -857,6 +858,7 @@ set(viewer_HEADER_FILES llfloaterinspect.h llfloaterinventory.h llfloaterjoystick.h + llfloaterlagmeter.h llfloaterland.h llfloaterlandholdings.h llfloatermap.h @@ -1768,7 +1770,6 @@ if (WINDOWS) media_plugin_webkit winmm_shim windows-crash-logger - windows-updater ) if (FMODEX) @@ -1814,7 +1815,6 @@ if (WINDOWS) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin - windows-updater windows-crash-logger ) |