diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-26 19:24:54 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-26 19:24:54 +0300 |
| commit | 7c9e92f49402d0dca29357161d6a6b1eb16d7ab7 (patch) | |
| tree | 660cf5dc24f8eec801dd754994ce49e39ed3e1bc /indra | |
| parent | 7829b4d3f46ff21d1d932b06f4721760ebbde014 (diff) | |
SL-12016 Mini-map avatar icon (Z-position) fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 248c361ca4..cb6f3fcf2d 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -354,7 +354,7 @@ void LLNetMap::draw() LLColor4 color = show_as_friend ? map_avatar_friend_color : map_avatar_color; - unknown_relative_z = positions[i].mdV[VZ] == COARSEUPDATE_MAX_Z && + unknown_relative_z = positions[i].mdV[VZ] >= COARSEUPDATE_MAX_Z && camera_position.mV[VZ] >= COARSEUPDATE_MAX_Z; LLWorldMapView::drawAvatar( diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 86249badaa..853da80e9e 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -1154,7 +1154,7 @@ void LLWorldMapView::drawAvatar(F32 x_pixels, { const F32 HEIGHT_THRESHOLD = 7.f; LLUIImagePtr dot_image = sAvatarLevelImage; - if (unknown_relative_z) + if (unknown_relative_z && llabs(relative_z) > HEIGHT_THRESHOLD) { dot_image = sAvatarUnknownImage; } |