diff options
| author | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
| commit | a1041a6fa17368e13d610df9d5eb23e307654815 (patch) | |
| tree | 5f8c22e1bbdeb727600c31ff60f908b785c2faae /linden/indra/newview/llworldmapview.cpp | |
| parent | Moved "Show HUD Attachments" back to View, restored shortcut. (diff) | |
| parent | Fixed region names not showing up on regions with zero avatars (diff) | |
| download | meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.zip meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.gz meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.bz2 meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Diffstat (limited to 'linden/indra/newview/llworldmapview.cpp')
| -rw-r--r-- | linden/indra/newview/llworldmapview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp index 947bdfd..485a895 100644 --- a/linden/indra/newview/llworldmapview.cpp +++ b/linden/indra/newview/llworldmapview.cpp | |||
| @@ -682,9 +682,8 @@ void LLWorldMapView::draw() | |||
| 682 | LLFontGL::LEFT, | 682 | LLFontGL::LEFT, |
| 683 | LLFontGL::BASELINE, | 683 | LLFontGL::BASELINE, |
| 684 | LLFontGL::DROP_SHADOW); | 684 | LLFontGL::DROP_SHADOW); |
| 685 | |||
| 686 | mesg = info->mName; | ||
| 687 | } | 685 | } |
| 686 | mesg = info->mName; | ||
| 688 | } | 687 | } |
| 689 | else | 688 | else |
| 690 | { | 689 | { |