diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-05-14 14:24:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-14 14:24:21 -0500 |
| commit | 7bfb29687c2e621d3aae9e2794a57dc0168fdf1d (patch) | |
| tree | 50b128638c6ce451234ac71c734c3376ea1d6046 /indra/newview/llfloaterregioninfo.cpp | |
| parent | 193d9d5f767c2bfad1dc5ced4fa630d05ae798ae (diff) | |
| parent | d21f29b6439db5b954d630a4461fe77365cdb4b3 (diff) | |
Merge pull request #1446 from Ansariel/project/gltf_development
Fix broken merge and BOOL/bool issues
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 780f4451cb..728c4fde18 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -1747,7 +1747,7 @@ bool LLPanelRegionTerrainInfo::sendUpdate() // Prevent applying unsupported alpha blend/double-sided materials if (!validateMaterials()) { - return FALSE; + return false; } // Check if terrain Elevation Ranges are correct |