diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 078294407969f9bc05e48b7fdfaf7a2aa963b138..98db7f31c0e0c86552fdf3d51b1c10682936d5d7 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -41,7 +41,7 @@ class LLVolumeParams;
 class LLProfile;
 class LLPath;
 
-#define LL_MESH_ENABLED 0
+#define LL_MESH_ENABLED 1
 
 template <class T> class LLOctreeNode;
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index df9393c31660a2bc70740d5e2346c8eb8e9de224..1d5d1584d3e210b384c6490b81b49fa038c4ce1f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4908,7 +4908,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <real>0</real>
+    <real>1</real>
   </map>
   <key>MigrateCacheDirectory</key>
     <map>