aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-25 16:41:26 -0700
committerMcCabe Maxsted2009-09-25 16:41:26 -0700
commitb621687362d412574caa1ee42cf7a982e6219cd3 (patch)
treea0b1228b1f09f3b848a3be5014d2700b2ad51f30
parentFixed Windows using wrong GStreamer library names (diff)
downloadmeta-impy-b621687362d412574caa1ee42cf7a982e6219cd3.zip
meta-impy-b621687362d412574caa1ee42cf7a982e6219cd3.tar.gz
meta-impy-b621687362d412574caa1ee42cf7a982e6219cd3.tar.bz2
meta-impy-b621687362d412574caa1ee42cf7a982e6219cd3.tar.xz
Fixed region names not showing up on regions with zero avatars
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llworldmapview.cpp3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 94943c2..3272dd6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -9,6 +9,11 @@
9 9
10 modified: linden/indra/cmake/GStreamer.cmake 10 modified: linden/indra/cmake/GStreamer.cmake
11 11
12
13 * Fixed region names not showing up on regions with zero avatars.
14
15 modified: linden/indra/newview/llworldmapview.cpp
16
12 17
132009-09-24 McCabe Maxsted <hakushakukun@gmail.com> 182009-09-24 McCabe Maxsted <hakushakukun@gmail.com>
14 19
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 {