From 17f1db266fdff542966722aaaa6f22d295d6ed55 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Fri, 12 Sep 2025 22:39:27 +0200 Subject: [PATCH] Actually, that return; there is counterproductive --- indra/newview/pipeline.cpp | 42 ++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e54b358848..ee7aa1c9ce 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3932,29 +3932,27 @@ void LLPipeline::postSort(LLCamera &camera) LLViewerRegion* region = gAgent.getRegion(); if (!region) { - return; + LLVector3 origin = region->getOriginAgent(); + F32 width = region->getWidth(); + + LLVector3 corner1 = origin; // Southwest + LLVector3 corner2 = origin + LLVector3(width, 0, 0); // Southeast + LLVector3 corner3 = origin + LLVector3(0, width, 0); // Northwest + LLVector3 corner4 = origin + LLVector3(width, width, 0); // Northeast + + corner1.mV[VZ] = region->getLandHeightRegion(LLVector3(0, 0, 0)); + corner2.mV[VZ] = region->getLandHeightRegion(LLVector3(width, 0, 0)); + corner3.mV[VZ] = region->getLandHeightRegion(LLVector3(0, width, 0)); + corner4.mV[VZ] = region->getLandHeightRegion(LLVector3(width, width, 0)); + + LLColor4 corner_color(1.0f, 1.0f, 0.0f, 0.8f); + LLColor4 text_color(1.0f, 1.0f, 1.0f, 1.0f); + + gObjectList.addDebugBeacon(corner1, "SW", corner_color, text_color, DebugBeaconLineWidth); + gObjectList.addDebugBeacon(corner2, "SE", corner_color, text_color, DebugBeaconLineWidth); + gObjectList.addDebugBeacon(corner3, "NW", corner_color, text_color, DebugBeaconLineWidth); + gObjectList.addDebugBeacon(corner4, "NE", corner_color, text_color, DebugBeaconLineWidth); } - - LLVector3 origin = region->getOriginAgent(); - F32 width = region->getWidth(); - - LLVector3 corner1 = origin; // Southwest - LLVector3 corner2 = origin + LLVector3(width, 0, 0); // Southeast - LLVector3 corner3 = origin + LLVector3(0, width, 0); // Northwest - LLVector3 corner4 = origin + LLVector3(width, width, 0); // Northeast - - corner1.mV[VZ] = region->getLandHeightRegion(LLVector3(0, 0, 0)); - corner2.mV[VZ] = region->getLandHeightRegion(LLVector3(width, 0, 0)); - corner3.mV[VZ] = region->getLandHeightRegion(LLVector3(0, width, 0)); - corner4.mV[VZ] = region->getLandHeightRegion(LLVector3(width, width, 0)); - - LLColor4 corner_color(1.0f, 1.0f, 0.0f, 0.8f); - LLColor4 text_color(1.0f, 1.0f, 1.0f, 1.0f); - - gObjectList.addDebugBeacon(corner1, "SW", corner_color, text_color, DebugBeaconLineWidth); - gObjectList.addDebugBeacon(corner2, "SE", corner_color, text_color, DebugBeaconLineWidth); - gObjectList.addDebugBeacon(corner3, "NW", corner_color, text_color, DebugBeaconLineWidth); - gObjectList.addDebugBeacon(corner4, "NE", corner_color, text_color, DebugBeaconLineWidth); } //