diff options
| author | Kitty Barnett <develop@catznip.com> | 2022-08-28 00:08:38 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2022-08-28 00:08:38 +0200 |
| commit | 5440464a9cbff6f64f79667ac026a7a1983b28b4 (patch) | |
| tree | 26a643a95e6aa99995ce728e4d2bf21cbdaa2c59 /indra/newview/llworldmapview.cpp | |
| parent | 717fe2cc5c35151f4712519f649276d4877d09a3 (diff) | |
| parent | d58b530e805e2b3c943b1ff446ac84a10c500b32 (diff) | |
Merge branch 'contribution/emoji'
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index a6df079223..70cb4f602a 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -469,7 +469,8 @@ void LLWorldMapView::draw() S32_MAX, //max_chars sMapScale, //max_pixels NULL, - TRUE); //use ellipses + /*use_ellipses*/TRUE, + /*use_color*/FALSE); } } } |