diff options
author | simon <none@none> | 2014-02-10 16:11:50 -0800 |
---|---|---|
committer | simon <none@none> | 2014-02-10 16:11:50 -0800 |
commit | cb2045fcd5106b5e0028869fc6a3e080d3f8e779 (patch) | |
tree | 8270c7d248f542107472fff9f2eb10f30721e1ee /indra/newview/CMakeLists.txt | |
parent | 8e5da5125de2bc9f8ce5ed2677556953e008c59d (diff) | |
parent | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (diff) |
Merge downstream code with 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 e044524131..c4886d5b73 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 @@ -854,6 +855,7 @@ set(viewer_HEADER_FILES llfloaterregiondebugconsole.h llfloaterregioninfo.h llfloaterreporter.h + llfloaterregionrestarting.h llfloaterscriptdebug.h llfloaterscriptlimits.h llfloatersearch.h |