diff options
author | Kitty Barnett <develop@catznip.com> | 2022-11-09 22:55:29 +0100 |
---|---|---|
committer | Kitty Barnett <develop@catznip.com> | 2022-11-09 23:25:02 +0100 |
commit | 7ebaa2d2e55c6a9b7feeb684190628e340ad7920 (patch) | |
tree | 506c00c18a41846d77f171fa4940c534cabf9060 /indra/newview/llworldmapview.cpp | |
parent | 6e79ca4959d98c0305ff1c158b5402f56aba5430 (diff) | |
parent | b5033a8859b38df045cc74e074aaee864985f145 (diff) |
Merge branch contribution/emoji into DRTVWR-489-emoji
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rwxr-xr-x | 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 6e994b4e68..67632cdbf7 100755 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -551,7 +551,8 @@ void LLWorldMapView::draw() S32_MAX, //max_chars mMapScale, //max_pixels NULL, - TRUE); //use ellipses + /*use_ellipses*/TRUE, + /*use_color*/FALSE); } } } |