aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt7
-rw-r--r--linden/indra/newview/llvoavatar.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9f3acc7..8d437c9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
12009-11-12 McCabe Maxsted <hakushakukun@gmail.com>
2
3 * Fixed Hide Group Titles preferences option.
4
5 modified: linden/indra/newview/llvoavatar.cpp
6
7
12009-11-09 McCabe Maxsted <hakushakukun@gmail.com> 82009-11-09 McCabe Maxsted <hakushakukun@gmail.com>
2 9
3 * Added Geneko Nemeth and Lilly Zenovka to About > Imprudence. 10 * Added Geneko Nemeth and Lilly Zenovka to About > Imprudence.
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index df07701..5b50619 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3270,7 +3270,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
3270 { 3270 {
3271 std::string line; 3271 std::string line;
3272 3272
3273 if (title && title->getString() && title->getString()[0] != '\0') 3273 if (mRenderGroupTitles && title && title->getString() && title->getString()[0] != '\0')
3274 { 3274 {
3275 line += title->getString(); 3275 line += title->getString();
3276 //LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR); IMP-136 -- MC 3276 //LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR); IMP-136 -- MC