diff options
| author | McCabe Maxsted | 2009-09-27 17:06:50 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-27 17:06:50 -0700 |
| commit | 861d77064048b0001e562847c8cf9adaac56cb57 (patch) | |
| tree | b498b1d955a82a2798d5914e3b2d7c3c363ea200 /linden/indra/newview/llnetmap.cpp | |
| parent | Fixed JPEG quality slider displaying over high-res checkbox in snapshot float... (diff) | |
| download | meta-impy-861d77064048b0001e562847c8cf9adaac56cb57.zip meta-impy-861d77064048b0001e562847c8cf9adaac56cb57.tar.gz meta-impy-861d77064048b0001e562847c8cf9adaac56cb57.tar.bz2 meta-impy-861d77064048b0001e562847c8cf9adaac56cb57.tar.xz | |
Fixed bad merge in llnetmap.cpp
Diffstat (limited to 'linden/indra/newview/llnetmap.cpp')
| -rw-r--r-- | linden/indra/newview/llnetmap.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp index e848aeb..f055dbc 100644 --- a/linden/indra/newview/llnetmap.cpp +++ b/linden/indra/newview/llnetmap.cpp | |||
| @@ -388,16 +388,6 @@ void LLNetMap::draw() | |||
| 388 | } | 388 | } |
| 389 | // [/RLVa:KB] | 389 | // [/RLVa:KB] |
| 390 | 390 | ||
| 391 | // [RLVa:KB] | ||
| 392 | if ( !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) ) | ||
| 393 | { | ||
| 394 | // User is not allowed to see who it is, or even if it's a friend, | ||
| 395 | // due to RLV settings. | ||
| 396 | glyph_color = avatar_color; | ||
| 397 | } | ||
| 398 | // [/RLVa:KB] | ||
| 399 | |||
| 400 | |||
| 401 | LLWorldMapView::drawAvatar( | 391 | LLWorldMapView::drawAvatar( |
| 402 | pos_map.mV[VX], pos_map.mV[VY], | 392 | pos_map.mV[VX], pos_map.mV[VY], |
| 403 | glyph_color, | 393 | glyph_color, |