Merged master into DRTVWR-508

1 files changed, 4 insertions, 18 deletions

diff --git a/indra/newview/llvowlsky.h b/indra/newview/llvowlsky.h
index 1d419b5fea..2b7ebe75dd 100644
--- a/indra/newview/llvowlsky.h
+++ b/indra/newview/llvowlsky.h
@@ -31,17 +31,8 @@
 
 class LLVOWLSky : public LLStaticViewerObject {
 private:
-	static const F32 DISTANCE_TO_STARS;
-
-	// anything less than 3 makes it impossible to create a closed dome.
-	static const U32 MIN_SKY_DETAIL;
-	// anything bigger than about 180 will cause getStripsNumVerts() to exceed 65535.
-	static const U32 MAX_SKY_DETAIL;
-
 	inline static U32 getNumStacks(void);
 	inline static U32 getNumSlices(void);
-	inline static U32 getFanNumVerts(void);
-	inline static U32 getFanNumIndices(void);
 	inline static U32 getStripsNumVerts(void);
 	inline static U32 getStripsNumIndices(void);
 	inline static U32 getStarsNumVerts(void);
@@ -50,9 +41,6 @@ private:
 public:
 	LLVOWLSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
 
-	void initSunDirection(LLVector3 const & sun_direction,
-		LLVector3 const & sun_angular_velocity);
-
 	/*virtual*/ void		 idleUpdate(LLAgent &agent, const F64 &time);
 	/*virtual*/ BOOL		 isActive(void) const;
 	/*virtual*/ LLDrawable * createDrawable(LLPipeline *pipeline);
@@ -60,6 +48,7 @@ public:
 
 	void drawStars(void);
 	void drawDome(void);
+    void drawFsSky(void); // fullscreen sky for advanced atmo
 	void resetVertexBuffers(void);
 	
 	void cleanupGL();
@@ -72,16 +61,13 @@ private:
 	// helper function for initializing the stars.
 	void initStars();
 
-	// helper function for building the fan vertex buffer.
-	static void buildFanBuffer(LLStrider<LLVector3> & vertices,
-							   LLStrider<LLVector2> & texCoords,
-							   LLStrider<U16> & indices);
-
 	// helper function for building the strips vertex buffer.
 	// note begin_stack and end_stack follow stl iterator conventions,
 	// begin_stack is the first stack to be included, end_stack is the first
 	// stack not to be included.
 	static void buildStripsBuffer(U32 begin_stack, U32 end_stack,
+                                  U32& vertex_count,
+                                  U32& index_count,
 								  LLStrider<LLVector3> & vertices,
 								  LLStrider<LLVector2> & texCoords,
 								  LLStrider<U16> & indices);
@@ -93,7 +79,7 @@ private:
 	BOOL updateStarGeometry(LLDrawable *drawable);
 
 private:
-	LLPointer<LLVertexBuffer>					mFanVerts;
+    LLPointer<LLVertexBuffer>					mFsSkyVerts;
 	std::vector< LLPointer<LLVertexBuffer> >	mStripsVerts;
 	LLPointer<LLVertexBuffer>					mStarsVerts;