summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-15 16:41:30 -0400
committerOz Linden <oz@lindenlab.com>2010-10-15 16:41:30 -0400
commitba2300b8aeff30a64d3f34b0cd5c49aa890e0639 (patch)
treed7a7f4aa61d1b2bd28374e5c61f3d6730d450574 /indra/newview/llviewerdisplay.cpp
parenta8b5da9a70936923e650bd5c200276da49106784 (diff)
parent18321756297bd9b04a4204abe4fbb0e3e8112186 (diff)
pull fix for STORM-211
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r--indra/newview/llviewerdisplay.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 916cbe2267..6640e32cd2 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -318,7 +318,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++;