diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-05 01:05:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-05 01:05:08 +0200 |
commit | 25251c3ba81629f3234fc94c0368cd6300732b09 (patch) | |
tree | 03ababecc49376c0e607b3548d9beb596f79c3a7 /indra/newview/llworldmapview.cpp | |
parent | d47c6536820d1ed6e373147678dd0fab90e80ab8 (diff) | |
parent | b68a05e7c30930976ed1273b4c7a0fec01d2a84f (diff) |
Merge pull request #924 from secondlife/marchcat/x-merge
Emoji -> Maint X merge
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rwxr-xr-x | indra/newview/llworldmapview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index cc947c87d5..a8676d2ad6 100755 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -520,7 +520,7 @@ void LLWorldMapView::draw() S32_MAX, //max_chars mMapScale, //max_pixels NULL, - TRUE); //use ellipses + /*use_ellipses*/TRUE); } } } |