summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-01-19 13:31:55 -0500
committerOz Linden <oz@lindenlab.com>2016-01-19 13:31:55 -0500
commitb22efa0730623ac02c28307eb837bd977c089916 (patch)
tree117accf4826abb20532b827c2d01f0bdb1ee75bc /indra/newview/llvoavatar.cpp
parent022a71d7ce261c5362fc6253e29d649432b58248 (diff)
correct merge problems
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-xindra/newview/llvoavatar.cpp2
1 files changed, 1 insertions, 1 deletions
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