diff options
| author | James Cook <james@lindenlab.com> | 2010-03-08 10:54:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-08 10:54:23 -0800 |
| commit | 18ebacefcfb5909a58a213a97c6a687afe9b877e (patch) | |
| tree | 5b48ebad64a253bd9aa50371c2308389cbec64bf /indra/newview/llviewerdisplay.cpp | |
| parent | 34d1d34ca100fd137c2a85f0e0f330730fb70aba (diff) | |
| parent | 42606dbbb5f452211e4fc30ee0ed41334fc14e8d (diff) | |
Merge with viewer 2 beta 4
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 6c1c1d1096..9682dc7af8 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -323,7 +323,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LLImageGL::updateStats(gFrameTimeSeconds); LLVOAvatar::sRenderName = gSavedSettings.getS32("AvatarNameTagMode"); - LLVOAvatar::sRenderGroupTitles = (gSavedSettings.getBOOL("RenderShowGroupTitleAll") && gSavedSettings.getS32("AvatarNameTagMode")); + LLVOAvatar::sRenderGroupTitles = (gSavedSettings.getBOOL("NameTagShowGroupTitles") && gSavedSettings.getS32("AvatarNameTagMode")); gPipeline.mBackfaceCull = TRUE; gFrameCount++; |