diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 876664d25a..51b6948ba4 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -516,6 +516,7 @@ set(viewer_SOURCE_FILES
llmenuoptionpathfindingrebakenavmesh.cpp
llmeshrepository.cpp
llmimetypes.cpp
+ llmodelpreview.cpp
llmorphview.cpp
llmoveview.cpp
llmutelist.cpp
@@ -1277,6 +1278,7 @@ set(viewer_HEADER_FILES
llmenuoptionpathfindingrebakenavmesh.h
llmeshrepository.h
llmimetypes.h
+ llmodelpreview.h
llmorphview.h
llmoveview.h
llmutelist.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ecb16e5145..d68d52d5da 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9051,188 +9051,6 @@
Backup
0
- MeshPreviewCanvasColor
-
- MeshPreviewEdgeColor
-
- MeshPreviewBaseColor
-
- MeshPreviewBrightnessColor
-
- MeshPreviewEdgeWidth
-
- MeshPreviewPhysicsEdgeColor
-
- MeshPreviewPhysicsFillColor
-
- MeshPreviewPhysicsEdgeWidth
-
- MeshPreviewDegenerateEdgeColor
-
- MeshPreviewDegenerateFillColor
-
- MeshPreviewDegenerateEdgeWidth
-
- MeshPreviewDegeneratePointSize
-
- MeshPreviewZoomLimit
-
FSMeshPreviewUVGuideFile
- PreviewRenderSize
-
PreviewAmbientColor