diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-03-19 16:09:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-19 16:09:54 +0200 |
| commit | b39e281767151f41fb9fec8cbf6eb1acac6ab72f (patch) | |
| tree | 6026973465084de434c390906fbaa923ed521a7a /indra | |
| parent | f04992676d5ab17cc34b310e06ce7d838c5232b9 (diff) | |
| parent | a5f1cca07589a53c659c9bea296ff6cae57b36df (diff) | |
Merge pull request #3769 from secondlife/marchcat/maint-b-cp-2
Maint B leftover commits
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llviewerparceloverlay.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login_first.xml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp index 2e9b5de72b..19066217b1 100755 --- a/indra/newview/llviewerparceloverlay.cpp +++ b/indra/newview/llviewerparceloverlay.cpp @@ -581,7 +581,7 @@ void LLViewerParcelOverlay::addPropertyLine(F32 start_x, F32 start_y, F32 dx, F3 outside_y += dy * (dy - LINE_WIDTH); // Middle part, full width - const S32 GRID_STEP = S32( PARCEL_GRID_STEP_METERS ); + const S32 GRID_STEP = (S32)PARCEL_GRID_STEP_METERS; for (S32 i = 1; i < GRID_STEP; i++) { inside_z = land.resolveHeightRegion( inside_x, inside_y ); @@ -666,7 +666,9 @@ void LLViewerParcelOverlay::renderPropertyLines() return; LLSurface& land = mRegion->getLand(); - F32 water_z = land.getWaterHeight() + 0.01f; + + bool render_water = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_VOIDWATER); + F32 water_z = render_water ? land.getWaterHeight() + 0.01f : 0; LLGLSUIDefault gls_ui; // called from pipeline gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml index c906e2f96c..d6ac71db94 100644 --- a/indra/newview/skins/default/xui/en/panel_login_first.xml +++ b/indra/newview/skins/default/xui/en/panel_login_first.xml @@ -179,7 +179,6 @@ control_name="RememberPassword" follows="left|top" font="SansSerifLarge" - text_color="EmphasisColor" height="24" left="262" bottom_delta="0" |