summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/llmath/llvolume.h2
-rw-r--r--indra/newview/app_settings/settings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 0782944079..98db7f31c0 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 df9393c316..1d5d1584d3 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>