Merge

1 files changed, 37 insertions, 34 deletions

diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index e2d6ce4b69..32ac531306 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -792,39 +792,39 @@ public:
 class LLVolumeFace
 {
 public:
-	class VertexData
-	{
-		enum 
-		{
-			POSITION = 0,
-			NORMAL = 1
-		};
-
-	private:
-		void init();
-	public:
-		VertexData();
-		VertexData(const VertexData& rhs);
-		const VertexData& operator=(const VertexData& rhs);
-
-		~VertexData();
-		LLVector4a& getPosition();
-		LLVector4a& getNormal();
-		const LLVector4a& getPosition() const;
-		const LLVector4a& getNormal() const;
-		void setPosition(const LLVector4a& pos);
-		void setNormal(const LLVector4a& norm);
-		
-
-		LLVector2 mTexCoord;
-
-		bool operator<(const VertexData& rhs) const;
-		bool operator==(const VertexData& rhs) const;
-		bool compareNormal(const VertexData& rhs, F32 angle_cutoff) const;
-
-	private:
-		LLVector4a* mData;
-	};
+	class VertexData

+	{

+		enum 

+		{

+			POSITION = 0,

+			NORMAL = 1

+		};

+

+	private:

+		void init();

+	public:

+		VertexData();

+		VertexData(const VertexData& rhs);

+		const VertexData& operator=(const VertexData& rhs);

+

+		~VertexData();

+		LLVector4a& getPosition();

+		LLVector4a& getNormal();

+		const LLVector4a& getPosition() const;

+		const LLVector4a& getNormal() const;

+		void setPosition(const LLVector4a& pos);

+		void setNormal(const LLVector4a& norm);

+		

+

+		LLVector2 mTexCoord;

+

+		bool operator<(const VertexData& rhs) const;

+		bool operator==(const VertexData& rhs) const;

+		bool compareNormal(const VertexData& rhs, F32 angle_cutoff) const;

+

+	private:

+		LLVector4a* mData;

+	};

 
 	LLVolumeFace();
 	LLVolumeFace(const LLVolumeFace& src);
@@ -870,6 +870,8 @@ public:
 	};
 
 	void optimize(F32 angle_cutoff = 2.f);
+	void cacheOptimize();
+
 	void createOctree(F32 scaler = 0.25f, const LLVector4a& center = LLVector4a(0,0,0), const LLVector4a& size = LLVector4a(0.5f,0.5f,0.5f));
 
 	enum
@@ -1027,12 +1029,13 @@ public:
 	friend std::ostream& operator<<(std::ostream &s, const LLVolume *volumep);		// HACK to bypass Windoze confusion over 
 																				// conversion if *(LLVolume*) to LLVolume&
 	const LLVolumeFace &getVolumeFace(const S32 f) const {return mVolumeFaces[f];} // DO NOT DELETE VOLUME WHILE USING THIS REFERENCE, OR HOLD A POINTER TO THIS VOLUMEFACE
-
+	
 	U32					mFaceMask;			// bit array of which faces exist in this volume
 	LLVector3			mLODScaleBias;		// vector for biasing LOD based on scale
 	
 	void sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level);
 	void copyVolumeFaces(const LLVolume* volume);
+	void cacheOptimize();
 
 private:
 	void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type);