diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-03-23 12:43:44 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-03-23 12:43:44 -0700 |
| commit | 760941d504d1dc6d423b7246a0ea1d1d73aed4a5 (patch) | |
| tree | ff88cd57bb03cf38fb7fef121647b1951ede1aaa /indra/newview/CMakeLists.txt | |
| parent | bdb9a769f12754dadf324b3dd395c1ca1519f938 (diff) | |
| parent | c489f1f8647a77c8c7d5fb5b721433dd72cb49c8 (diff) | |
Pull merge from lindenlab/viewer-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 6aed4b6563..99cc707fbc 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -250,6 +250,7 @@ set(viewer_SOURCE_FILES llfloaterhandler.cpp llfloaterhardwaresettings.cpp llfloaterhelpbrowser.cpp + llfloaterhoverheight.cpp llfloaterhud.cpp llfloaterimagepreview.cpp llfloaterimsessiontab.cpp @@ -856,6 +857,7 @@ set(viewer_HEADER_FILES llfloaterhandler.h llfloaterhardwaresettings.h llfloaterhelpbrowser.h + llfloaterhoverheight.h llfloaterhud.h llfloaterimagepreview.h llfloaterimnearbychat.h |