diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 11:15:53 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 11:15:53 -0500 |
commit | b242d696ba03f66494dfca1f05a74ed1b15cd6e4 (patch) | |
tree | 9c432e679ce270642bbca587f3c9c9a36b348bc1 /indra/newview/llworldmapview.cpp | |
parent | 19b808316b7d4095905baf6ff9f26e3045a86fcd (diff) | |
parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) |
Merge branch 'main' of github.com:secondlife/viewer
on promotion of DRTVWR-489 Emoji viewer.
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); } } } |