Merge of windlight into release (QAR-286). This includes all changes in

windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620

1 files changed, 0 insertions, 77 deletions

diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index e9aa9b0232..dc1102eba7 100644
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -663,83 +663,6 @@ BOOL LLSurface::idleUpdate(F32 max_update_time)
 	return did_update;
 }
 
-// TODO -- move this to LLViewerRegion class
-void LLSurface::renderSurfaceBounds()
-{
-	//  Shows the edge of the surface, so that visibility across regions can be seen
-	LLVector3 origin_agent = getOriginAgent();
-	
-	glPushMatrix();
-	LLGLSNoTexture no_texture;
-	
-	F32 region_width_meters = gWorldPointer->getRegionWidthInMeters();
-	glTranslatef(origin_agent.mV[VX] + (region_width_meters * 0.005f),
-					origin_agent.mV[VY] + (region_width_meters * 0.005f), 0.f);
-
-	glColor4ub(0, 128, 0, 64); 
-
-	F32 length = region_width_meters * 0.995f;
-	F32 height = length/8.0f;
-
-	glBegin(GL_QUADS);
-		glVertex3f(length, 0, 0);
-		glVertex3f(0,0, 0);
-		glVertex3f(0,0, height);
-		glVertex3f(length,0, height);
-
-		glVertex3f(length,0, height);
-		glVertex3f(0,0, height);
-		glVertex3f(0,0, 0);
-		glVertex3f(length, 0, 0);
-	glEnd();
-
-	glTranslatef(length, 0, 0);
-	glRotated(90, 0, 0, 1);
-	glBegin(GL_QUADS);
-		glVertex3f(length, 0, 0);
-		glVertex3f(0,0, 0);
-		glVertex3f(0,0, height);
-		glVertex3f(length,0, height);
-
-		glVertex3f(length,0, height);
-		glVertex3f(0,0, height);
-		glVertex3f(0,0, 0);
-		glVertex3f(length, 0, 0);
-
-	glEnd();
-	glTranslatef(length, 0, 0);
-	glRotated(90, 0, 0, 1);
-	glBegin(GL_QUADS);
-		glVertex3f(length, 0, 0);
-		glVertex3f(0,0, 0);
-		glVertex3f(0,0, height);
-		glVertex3f(length,0, height);
-
-		glVertex3f(length,0, height);
-		glVertex3f(0,0, height);
-		glVertex3f(0,0, 0);
-		glVertex3f(length, 0, 0);
-	glEnd();
-	glTranslatef(length, 0, 0);
-	glRotated(90, 0, 0, 1);
-	glBegin(GL_QUADS);
-		glVertex3f(length, 0, 0);
-		glVertex3f(0,0, 0);
-		glVertex3f(0,0, height);
-		glVertex3f(length,0, height);
-
-		glVertex3f(length,0, height);
-		glVertex3f(0,0, height);
-		glVertex3f(0,0, 0);
-		glVertex3f(length, 0, 0);
-	glEnd();
-	glTranslatef(length, 0, 0);
-	glRotated(90, 0, 0, 1);
- 
-	glPopMatrix();
-}
-
-
 void LLSurface::decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL b_large_patch) 
 {