Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing"

This reverts commit de9184479cfc179ba6e9d6ff388aff7da7f0b4ab.

1 files changed, 1 insertions, 8 deletions

diff --git a/indra/newview/llvlcomposition.h b/indra/newview/llvlcomposition.h
index 882c3d89b2..9dc0b7221e 100644
--- a/indra/newview/llvlcomposition.h
+++ b/indra/newview/llvlcomposition.h
@@ -49,18 +49,11 @@ public:
 	// So we need to compress heights into this range.
     static const S32 ASSET_COUNT = 4;
 
-    enum class Type
-    {
-        TEXTURE,
-        PBR,
-        COUNT
-    };
-
     BOOL generateMaterials();
 
 	LLUUID getDetailAssetID(S32 asset);
 	virtual void setDetailAssetID(S32 asset, const LLUUID& id);
-    Type getMaterialType();
+    BOOL useTextures();
     BOOL texturesReady(BOOL boost = FALSE);
     BOOL materialsReady(BOOL boost = FALSE);