diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-03-25 22:50:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-03-25 22:50:26 +0000 |
| commit | 6fcf38217e8772b2f90c7a8e7ce6b60071f6d20c (patch) | |
| tree | a8e35fe195cc86c616daf9d8a21571e04bc2bc35 /indra/newview/llhudtext.cpp | |
| parent | 11a3589665aae1a2423e258e40eba45c117627d5 (diff) | |
merge release@82858 maint-render-2-merge@83010 -> release
QAR-389
Diffstat (limited to 'indra/newview/llhudtext.cpp')
| -rw-r--r-- | indra/newview/llhudtext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index 0468ae5a1a..e04a62167c 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -76,6 +76,7 @@ const F32 LOD_2_SCREEN_COVERAGE = 0.40f; std::set<LLPointer<LLHUDText> > LLHUDText::sTextObjects; std::vector<LLPointer<LLHUDText> > LLHUDText::sVisibleTextObjects; std::vector<LLPointer<LLHUDText> > LLHUDText::sVisibleHUDTextObjects; +BOOL LLHUDText::sDisplayText = TRUE ; bool lltextobject_further_away::operator()(const LLPointer<LLHUDText>& lhs, const LLPointer<LLHUDText>& rhs) const { @@ -120,7 +121,7 @@ LLHUDText::~LLHUDText() void LLHUDText::render() { - if (!mOnHUDAttachment) + if (!mOnHUDAttachment && sDisplayText) { LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); renderText(FALSE); |