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.h | |
parent | 11a3589665aae1a2423e258e40eba45c117627d5 (diff) |
merge release@82858 maint-render-2-merge@83010 -> release
QAR-389
Diffstat (limited to 'indra/newview/llhudtext.h')
-rw-r--r-- | indra/newview/llhudtext.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llhudtext.h b/indra/newview/llhudtext.h index 75dc43cd6a..bb96c356bb 100644 --- a/indra/newview/llhudtext.h +++ b/indra/newview/llhudtext.h @@ -124,6 +124,7 @@ public: static void renderAllHUD(); static void addPickable(std::set<LLViewerObject*> &pick_list); static void reshape(); + static void setDisplayText(BOOL flag) { sDisplayText = flag ; } protected: LLHUDText(const U8 type); @@ -170,6 +171,7 @@ private: S32 mLOD; BOOL mHidden; + static BOOL sDisplayText ; static std::set<LLPointer<LLHUDText> > sTextObjects; static std::vector<LLPointer<LLHUDText> > sVisibleTextObjects; static std::vector<LLPointer<LLHUDText> > sVisibleHUDTextObjects; |