Second Life viewer sources 1.20.2

1 files changed, 3 insertions, 9 deletions

diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp
index 281b644..ad34b6a 100644
--- a/linden/indra/newview/llviewerparceloverlay.cpp
+++ b/linden/indra/newview/llviewerparceloverlay.cpp
@@ -58,7 +58,6 @@ LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_
         mDirty( FALSE ),
         mTimeSinceLastUpdate(),
         mOverlayTextureIdx(-1),
-        mLineImageID( gViewerArt.getString("propertyline.tga") ),
         mVertexCount(0),
         mVertexArray(NULL),
         mColorArray(NULL)
@@ -750,20 +749,15 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
         LLGLSNoTexture gls_no_texture;
         LLGLDepthTest mDepthTest(GL_TRUE);
 
-        // JC - This doesn't work.
-        //gGLSUITextureDepth.set();
-        //LLViewerImage* image = gImageList.getImage( mLineImageID );
-        //image->bindTexture();
-
         // Find camera height off the ground (not from zero)
         F32 ground_height_at_camera = land.resolveHeightGlobal( gAgent.getCameraPositionGlobal() );
-        F32 camera_z = gCamera->getOrigin().mV[VZ];
+        F32 camera_z = LLViewerCamera::getInstance()->getOrigin().mV[VZ];
         F32 camera_height = camera_z - ground_height_at_camera;
 
         camera_height = llclamp(camera_height, 0.f, 100.f);
 
         // Pull lines toward camera by 1 cm per meter off the ground.
-        const LLVector3& CAMERA_AT = gCamera->getAtAxis();
+        const LLVector3& CAMERA_AT = LLViewerCamera::getInstance()->getAtAxis();
         F32 pull_toward_camera_scale = 0.01f * camera_height;
         LLVector3 pull_toward_camera = CAMERA_AT;
         pull_toward_camera *= -pull_toward_camera_scale;
@@ -791,7 +785,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
 
         // Set up a cull plane 2 * PARCEL_GRID_STEP_METERS behind
         // the camera.  The cull plane normal is the camera's at axis.
-        LLVector3 cull_plane_point = gCamera->getAtAxis();
+        LLVector3 cull_plane_point = LLViewerCamera::getInstance()->getAtAxis();
         cull_plane_point *= -2.f * PARCEL_GRID_STEP_METERS;
         cull_plane_point += camera_region;