diff options
| author | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
| commit | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (patch) | |
| tree | 43935b338c5a87ca32f9240389470a96271fa1f5 /indra/newview/CMakeLists.txt | |
| parent | 8b09dfb8907c364f09ee82d00926219ae52b5ee9 (diff) | |
| parent | 7cc7d143837f2b75f750c139e33fdf5afa8a8866 (diff) | |
Automated merge with file:///e:\code\viewer-experience
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 935dd2e887..6292ee97c8 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -209,6 +209,7 @@ set(viewer_SOURCE_FILES llfloatermediasettings.cpp llfloatermemleak.cpp llfloatermodelpreview.cpp + llfloatermodeluploadbase.cpp llfloatermodelwizard.cpp llfloaternamedesc.cpp llfloaternotificationsconsole.cpp @@ -503,6 +504,7 @@ set(viewer_SOURCE_FILES lltranslate.cpp lluilistener.cpp lluploaddialog.cpp + lluploadfloaterobservers.cpp llurl.cpp llurldispatcher.cpp llurldispatcherlistener.cpp @@ -769,6 +771,7 @@ set(viewer_HEADER_FILES llfloatermediasettings.h llfloatermemleak.h llfloatermodelpreview.h + llfloatermodeluploadbase.h llfloatermodelwizard.h llfloaternamedesc.h llfloaternotificationsconsole.h @@ -1060,6 +1063,7 @@ set(viewer_HEADER_FILES lluiconstants.h lluilistener.h lluploaddialog.h + lluploadfloaterobservers.h llurl.h llurldispatcher.h llurldispatcherlistener.h |