secondlife/viewer#1475: Fix whitespace and remove comment

1 files changed, 57 insertions, 57 deletions

diff --git a/indra/newview/llvlcomposition.h b/indra/newview/llvlcomposition.h
index 5e6fe52f5f..a003f74eda 100644
--- a/indra/newview/llvlcomposition.h
+++ b/indra/newview/llvlcomposition.h
@@ -41,21 +41,21 @@ class LLFetchedGLTFMaterial;
 class LLModifyRegion
 {
 public:
-	virtual const LLGLTFMaterial* getMaterialOverride(S32 asset) const = 0;
+    virtual const LLGLTFMaterial* getMaterialOverride(S32 asset) const = 0;
 };
 
 class LLTerrainMaterials : public LLModifyRegion
 {
 public:
-	friend class LLDrawPoolTerrain;
+    friend class LLDrawPoolTerrain;
 
     LLTerrainMaterials();
     virtual ~LLTerrainMaterials();
 
     void apply(const LLModifyRegion& other);
 
-	// Heights map into textures (or materials) as 0-1 = first, 1-2 = second, etc.
-	// So we need to compress heights into this range.
+    // Heights map into textures (or materials) as 0-1 = first, 1-2 = second, etc.
+    // So we need to compress heights into this range.
     static const S32 ASSET_COUNT = 4;
 
     enum class Type
@@ -65,14 +65,14 @@ public:
         COUNT
     };
 
-	bool generateMaterials();
+    bool generateMaterials();
 
     void boost();
 
-	virtual LLUUID getDetailAssetID(S32 asset);
-	virtual void setDetailAssetID(S32 asset, const LLUUID& id);
-	const LLGLTFMaterial* getMaterialOverride(S32 asset) const override;
-	virtual void setMaterialOverride(S32 asset, LLGLTFMaterial* mat_override);
+    virtual LLUUID getDetailAssetID(S32 asset);
+    virtual void setDetailAssetID(S32 asset, const LLUUID& id);
+    const LLGLTFMaterial* getMaterialOverride(S32 asset) const override;
+    virtual void setMaterialOverride(S32 asset, LLGLTFMaterial* mat_override);
     Type getMaterialType();
     bool texturesReady(bool boost, bool strict);
     // strict = true -> all materials must be sufficiently loaded
@@ -88,8 +88,8 @@ protected:
     // *NOTE: Prefer calling materialReady if mat is known to be LLFetchedGLTFMaterial
     static bool materialTexturesReady(LLPointer<LLFetchedGLTFMaterial>& mat, bool& textures_set, bool boost, bool strict);
 
-	LLPointer<LLViewerFetchedTexture> mDetailTextures[ASSET_COUNT];
-	LLPointer<LLFetchedGLTFMaterial> mDetailMaterials[ASSET_COUNT];
+    LLPointer<LLViewerFetchedTexture> mDetailTextures[ASSET_COUNT];
+    LLPointer<LLFetchedGLTFMaterial> mDetailMaterials[ASSET_COUNT];
     LLPointer<LLGLTFMaterial> mDetailMaterialOverrides[ASSET_COUNT];
     LLPointer<LLFetchedGLTFMaterial> mDetailRenderMaterials[ASSET_COUNT];
     bool mMaterialTexturesSet[ASSET_COUNT];
@@ -101,61 +101,61 @@ extern LLTerrainMaterials gLocalTerrainMaterials;
 class LLVLComposition : public LLTerrainMaterials, public LLViewerLayer
 {
 public:
-	// Heights map into textures (or materials) as 0-1 = first, 1-2 = second, etc.
-	// So we need to compress heights into this range.
+    // Heights map into textures (or materials) as 0-1 = first, 1-2 = second, etc.
+    // So we need to compress heights into this range.
     static const S32 ASSET_COUNT = 4;
-	static const LLUUID (&getDefaultTextures())[ASSET_COUNT];
-
-	LLVLComposition(LLSurface *surfacep, const U32 width, const F32 scale);
-	/*virtual*/ ~LLVLComposition();
-
-	void setSurface(LLSurface *surfacep);
-
-	// Viewer side hack to generate composition values
-	bool generateHeights(const F32 x, const F32 y, const F32 width, const F32 height);
-	bool generateComposition();
-	// Generate texture from composition values.
-	bool generateMinimapTileLand(const F32 x, const F32 y, const F32 width, const F32 height);		
-	bool generateTexture(const F32 x, const F32 y, const F32 width, const F32 height);		
-
-	// Use these as indeces ito the get/setters below that use 'corner'
-	enum ECorner
-	{
-		SOUTHWEST = 0,
-		SOUTHEAST = 1,
-		NORTHWEST = 2,
-		NORTHEAST = 3,
-		CORNER_COUNT = 4
-	};
-
-	void setDetailAssetID(S32 asset, const LLUUID& id) override;
-	F32 getStartHeight(S32 corner);
-	F32 getHeightRange(S32 corner);
-
-	void setStartHeight(S32 corner, F32 start_height);
-	void setHeightRange(S32 corner, F32 range);
-
-	friend class LLVOSurfacePatch;
-	friend class LLDrawPoolTerrain;
-	void setParamsReady()		{ mParamsReady = true; }
-	bool getParamsReady() const	{ return mParamsReady; }
+    static const LLUUID (&getDefaultTextures())[ASSET_COUNT];
+
+    LLVLComposition(LLSurface *surfacep, const U32 width, const F32 scale);
+    /*virtual*/ ~LLVLComposition();
+
+    void setSurface(LLSurface *surfacep);
+
+    // Viewer side hack to generate composition values
+    bool generateHeights(const F32 x, const F32 y, const F32 width, const F32 height);
+    bool generateComposition();
+    // Generate texture from composition values.
+    bool generateMinimapTileLand(const F32 x, const F32 y, const F32 width, const F32 height);      
+    bool generateTexture(const F32 x, const F32 y, const F32 width, const F32 height);      
+
+    // Use these as indeces ito the get/setters below that use 'corner'
+    enum ECorner
+    {
+        SOUTHWEST = 0,
+        SOUTHEAST = 1,
+        NORTHWEST = 2,
+        NORTHEAST = 3,
+        CORNER_COUNT = 4
+    };
+
+    void setDetailAssetID(S32 asset, const LLUUID& id) override;
+    F32 getStartHeight(S32 corner);
+    F32 getHeightRange(S32 corner);
+
+    void setStartHeight(S32 corner, F32 start_height);
+    void setHeightRange(S32 corner, F32 range);
+
+    friend class LLVOSurfacePatch;
+    friend class LLDrawPoolTerrain;
+    void setParamsReady()       { mParamsReady = true; }
+    bool getParamsReady() const { return mParamsReady; }
 
 protected:
-	bool mParamsReady = false;
-	LLSurface *mSurfacep;
+    bool mParamsReady = false;
+    LLSurface *mSurfacep;
 
     // Final minimap raw images
-	LLPointer<LLImageRaw> mRawImages[LLTerrainMaterials::ASSET_COUNT];
+    LLPointer<LLImageRaw> mRawImages[LLTerrainMaterials::ASSET_COUNT];
 
     // Only non-null during minimap tile generation
-	LLPointer<LLImageRaw> mRawImagesBaseColor[LLTerrainMaterials::ASSET_COUNT];
-	LLPointer<LLImageRaw> mRawImagesEmissive[LLTerrainMaterials::ASSET_COUNT];
+    LLPointer<LLImageRaw> mRawImagesBaseColor[LLTerrainMaterials::ASSET_COUNT];
+    LLPointer<LLImageRaw> mRawImagesEmissive[LLTerrainMaterials::ASSET_COUNT];
 
-	F32 mStartHeight[CORNER_COUNT];
-	F32 mHeightRange[CORNER_COUNT];
+    F32 mStartHeight[CORNER_COUNT];
+    F32 mHeightRange[CORNER_COUNT];
 
-	F32 mTexScaleX = 16.f;
-	F32 mTexScaleY = 16.f;
+    F32 mTexScaleX = 16.f;
+    F32 mTexScaleY = 16.f;
 };
 
 #endif //LL_LLVLCOMPOSITION_H