diff options
| author | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
| commit | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (patch) | |
| tree | 0e261edeab3e2e3f53a1f3ab825aa76906fff152 /indra/newview/llviewerdisplay.cpp | |
| parent | f5ba6df4c2dc5a5e0842ed028dd4de01406dca3b (diff) | |
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index c4ed4db3e2..f08c287529 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -312,8 +312,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LLImageGL::updateStats(gFrameTimeSeconds); - LLVOAvatar::sRenderName = gSavedSettings.getS32("RenderName"); - LLVOAvatar::sRenderGroupTitles = !gSavedSettings.getBOOL("RenderHideGroupTitleAll"); + LLVOAvatar::sRenderName = gSavedSettings.getS32("AvatarNameTagMode"); + LLVOAvatar::sRenderGroupTitles = (gSavedSettings.getBOOL("RenderShowGroupTitleAll") && gSavedSettings.getS32("AvatarNameTagMode")); gPipeline.mBackfaceCull = TRUE; gFrameCount++; |