diff options
Diffstat (limited to 'linden/indra/newview/llviewerparceloverlay.cpp')
-rw-r--r-- | linden/indra/newview/llviewerparceloverlay.cpp | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp index 91159f0..36a4449 100644 --- a/linden/indra/newview/llviewerparceloverlay.cpp +++ b/linden/indra/newview/llviewerparceloverlay.cpp | |||
@@ -293,7 +293,7 @@ void LLViewerParcelOverlay::uncompressLandOverlay(S32 chunk, U8 *packed_overlay) | |||
293 | S32 size = mParcelGridsPerEdge * mParcelGridsPerEdge; | 293 | S32 size = mParcelGridsPerEdge * mParcelGridsPerEdge; |
294 | S32 chunk_size = size / PARCEL_OVERLAY_CHUNKS; | 294 | S32 chunk_size = size / PARCEL_OVERLAY_CHUNKS; |
295 | 295 | ||
296 | memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size); | 296 | memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size); /*Flawfinder: ignore*/ |
297 | 297 | ||
298 | // Force property lines and overlay texture to update | 298 | // Force property lines and overlay texture to update |
299 | setDirty(); | 299 | setDirty(); |
@@ -780,27 +780,6 @@ S32 LLViewerParcelOverlay::renderPropertyLines () | |||
780 | const S32 GRID_STEP = S32( PARCEL_GRID_STEP_METERS ); | 780 | const S32 GRID_STEP = S32( PARCEL_GRID_STEP_METERS ); |
781 | const S32 vertex_per_edge = 3 + 2 * (GRID_STEP-1) + 3; | 781 | const S32 vertex_per_edge = 3 + 2 * (GRID_STEP-1) + 3; |
782 | 782 | ||
783 | /* JC - Don't do this. Unbinding AGP stalls the draw process, | ||
784 | dropping frame rate. Not unbinding AGP causes random crashes | ||
785 | on nVidia cards due to binding non-AGP arrays. | ||
786 | |||
787 | gPipeline.unbindAGP(); | ||
788 | glEnableClientState(GL_VERTEX_ARRAY); | ||
789 | glEnableClientState(GL_COLOR_ARRAY); | ||
790 | glVertexPointer(3, GL_FLOAT, 0, mVertexArray ); | ||
791 | glColorPointer( 4, GL_UNSIGNED_BYTE, 0, mColorArray ); | ||
792 | |||
793 | S32 i; | ||
794 | for (i = 0; i < mVertexCount; i += vertex_per_edge) | ||
795 | { | ||
796 | // Each edge is several vertices | ||
797 | glDrawArrays(GL_LINE_STRIP, i, vertex_per_edge); | ||
798 | } | ||
799 | |||
800 | glDisableClientState(GL_COLOR_ARRAY); | ||
801 | glDisableClientState(GL_VERTEX_ARRAY); | ||
802 | */ | ||
803 | |||
804 | // Stomp the camera into two dimensions | 783 | // Stomp the camera into two dimensions |
805 | LLVector3 camera_region = mRegion->getPosRegionFromGlobal( gAgent.getCameraPositionGlobal() ); | 784 | LLVector3 camera_region = mRegion->getPosRegionFromGlobal( gAgent.getCameraPositionGlobal() ); |
806 | 785 | ||