diff options
author | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:36:34 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:36:34 -0500 |
commit | a5e56067c28298b4df0ef498303f78f67c35782c (patch) | |
tree | ec5cf26d0eb8825a6d30fcf325e4862ddc353890 /indra/newview/CMakeLists.txt | |
parent | 197db4976ad8df958b7b2c59a66498398cfd0665 (diff) | |
parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) |
merge changes for 3.7.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 c5e1cde4e6..17e340d136 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -267,6 +267,7 @@ set(viewer_SOURCE_FILES llfloaterregiondebugconsole.cpp llfloaterregioninfo.cpp llfloaterreporter.cpp + llfloaterregionrestarting.cpp llfloaterscriptdebug.cpp llfloaterscriptlimits.cpp llfloatersearch.cpp @@ -855,6 +856,7 @@ set(viewer_HEADER_FILES llfloaterregiondebugconsole.h llfloaterregioninfo.h llfloaterreporter.h + llfloaterregionrestarting.h llfloaterscriptdebug.h llfloaterscriptlimits.h llfloatersearch.h |