3 files changed, 12 insertions, 20 deletions
diff --git a/indra/llrender/llrendersegment.cpp b/indra/llrender/llrendernavprim.cpp
index 1f57af174e..eea65b3a0d 100644
--- a/indra/llrender/llrendersegment.cpp
+++ b/indra/llrender/llrendernavprim.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file llrendersegment.cpp
+ * @file LLRenderNavPrim.cpp
  * @brief 
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
@@ -24,18 +24,16 @@
  * $/LicenseInfo$
  */
 
-//	Sphere creates a set of display lists that can then be called to create 
-//	a lit sphere at different LOD levels.  You only need one instance of sphere 
-//	per viewer - then call the appropriate list.  
 
 #include "linden_common.h"
-#include "llrendersegment.h"
+#include "llrendernavprim.h"
 #include "llerror.h"
 #include "llglheaders.h"
 
-LLRenderSegment gSegment;
 //=============================================================================
-void LLRenderSegment::renderSegment( const LLVector3& start, const LLVector3& end, int color )
+LLRenderNavPrim gRenderNav;
+//=============================================================================
+void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& end, int color )
 {	
 	
 	LLColor4 colorA( color );	
@@ -51,7 +49,7 @@ void LLRenderSegment::renderSegment( const LLVector3& start, const LLVector3& en
 	glLineWidth(1.0f);	
 }
 //=============================================================================
-void LLRenderSegment::renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color )
+void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color )
 {
 	LLGLEnable offset(GL_POLYGON_OFFSET_LINE);
 	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
diff --git a/indra/llrender/llrendersegment.h b/indra/llrender/llrendernavprim.h
index 58bc083e25..697c344d21 100644
--- a/indra/llrender/llrendersegment.h
+++ b/indra/llrender/llrendernavprim.h
@@ -1,5 +1,5 @@
 /** 
- * @file llrendersegment.h
+ * @file LLRenderNavPrim.h
  * @brief 
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
@@ -24,8 +24,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLRENDERSEGMENT_H
-#define LL_LLRENDERSEGMENT_H
+#ifndef LL_RENDER_NAVPRIM_H
+#define LL_RENDER_NAVPRIM_H
 
 #include "llmath.h"
 #include "v3math.h"
@@ -36,7 +36,7 @@
 #include "llgl.h"
 
 
-class LLRenderSegment
+class LLRenderNavPrim
 {
 public:
 	void renderSegment( const LLVector3& start, const LLVector3& end, int color );
@@ -45,6 +45,6 @@ public:
 private:
 };
 
-extern LLRenderSegment gSegment;
+extern LLRenderNavPrim gRenderNav;
 
 #endif
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 529ca9f022..ebe42f79f4 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -48,7 +48,6 @@
 #include "llvolumemgr.h"
 #include "lltextureatlas.h"
 #include "llglslshader.h"
-#include "llrendersegment.h"
 #include "llagent.h"
 
 static LLFastTimer::DeclareTimer FTM_FRUSTUM_CULL("Frustum Culling");
@@ -3995,12 +3994,7 @@ public:
 				renderAgentTarget(avatar);
 			}
 
-			//prep#
-			//LLVector3 pos = gAgent.getPositionGlobal();
-			//LLVector3d vel = gAgent.getVelocity();
-			//gSegment.renderSegment( pos, pos+vel, 0 );
-
-			
+					
 			if (gDebugGL)
 			{
 				for (U32 i = 0; i < drawable->getNumFaces(); ++i)