From 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 1 Nov 2007 22:02:35 +0000
Subject: svn merge -r 72652:72881
 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release

QAR-11: pair-reviewed the merge w/ Sam.
---
 indra/newview/llviewerdisplay.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llviewerdisplay.cpp')

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index b4dc093f6a..24b8105916 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -240,6 +240,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
 	LLImageGL::updateStats(gFrameTimeSeconds);
 
 	LLVOAvatar::sRenderName = gSavedSettings.getS32("RenderName");
+	LLVOAvatar::sRenderGroupTitles = gSavedSettings.getBOOL("RenderGroupTitleAll");
 	gPipeline.mBackfaceCull = TRUE;
 	gFrameCount++;
 	if (gFocusMgr.getAppHasFocus())
-- 
cgit v1.2.3