From b22efa0730623ac02c28307eb837bd977c089916 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 19 Jan 2016 13:31:55 -0500
Subject: correct merge problems

---
 indra/newview/llvoavatar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c31195cc91..2e8d8602f9 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8224,7 +8224,7 @@ void LLVOAvatar::idleUpdateRenderComplexity()
 		
 		if ( !mText )
 		{
-			initDebugTextHud();
+			initHudText();
 			mText->setFadeDistance(20.0, 5.0); // limit clutter in large crowds
 		}
 		else
-- 
cgit v1.2.3