1 files changed, 16 insertions, 28 deletions

diff --git a/linden/indra/newview/llsphere.cpp b/linden/indra/newview/llrendersphere.cpp
index 663537c..6e5c850 100644
--- a/linden/indra/newview/llsphere.cpp
+++ b/linden/indra/newview/llrendersphere.cpp
@@ -1,27 +1,17 @@
 /** 
- * @file llsphere.cpp
- * @brief implementation of the LLSphere class.
+ * @file llrendersphere.cpp
+ * @brief implementation of the LLRenderSphere class.
  *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * $LicenseInfo:firstyear=2001&license=internal$
  * 
  * Copyright (c) 2001-2008, Linden Research, Inc.
  * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
@@ -34,13 +24,13 @@
 //      per viewer - then call the appropriate list.  
 
 #include "llviewerprecompiledheaders.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llerror.h"
-#include "llvertexbuffer.h"
+
 #include "llglheaders.h"
 
 GLUquadricObj *gQuadObj2 = NULL;
-LLSphere gSphere;
+LLRenderSphere gSphere;
 
 void drawSolidSphere(GLdouble radius, GLint slices, GLint stacks);
 
@@ -108,7 +98,7 @@ void lat2xyz_rad(LLVector3 * result, F32 lat, F32 lon)
 // A couple thoughts on sphere drawing:
 // 1) You need more slices than stacks, but little less than 2:1
 // 2) At low LOD, setting stacks to an odd number avoids a "band" around the equator, making things look smoother
-void LLSphere::prerender()
+void LLRenderSphere::prerender()
 {
         //  Create a series of display lists for different LODs
         mDList[0] = glGenLists(1);
@@ -132,7 +122,7 @@ void LLSphere::prerender()
         glEndList();
 }
 
-void LLSphere::cleanupGL()
+void LLRenderSphere::cleanupGL()
 {
         for (S32 detail = 0; detail < 4; detail++)
         {
@@ -151,7 +141,7 @@ void LLSphere::cleanupGL()
 //
 // The toughest adjustment is the cutoff for the lowest LOD
 // Maybe we should have more LODs at the low end?
-void LLSphere::render(F32 pixel_area)
+void LLRenderSphere::render(F32 pixel_area)
 {
         S32 level_of_detail;
 
@@ -171,13 +161,11 @@ void LLSphere::render(F32 pixel_area)
         {
                 level_of_detail = 3;
         }
-        LLVertexBuffer::unbind();
         glCallList(mDList[level_of_detail]);
 }
 
 
-void LLSphere::render()
+void LLRenderSphere::render()
 {
-        LLVertexBuffer::unbind();
         glCallList(mDList[0]);
 }