diff options
author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/newview/llhudtext.h | |
parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/newview/llhudtext.h')
-rw-r--r-- | indra/newview/llhudtext.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llhudtext.h b/indra/newview/llhudtext.h index a2e328acd1..3e4474378b 100644 --- a/indra/newview/llhudtext.h +++ b/indra/newview/llhudtext.h @@ -95,8 +95,9 @@ public: void setUseBubble(BOOL use_bubble) { mUseBubble = use_bubble; } S32 getLOD() { return mLOD; } BOOL getVisible() { return mVisible; } + BOOL getHidden() const { return mHidden; } + void setHidden( BOOL hide ) { mHidden = hide; } void setOnHUDAttachment(BOOL on_hud) { mOnHUDAttachment = on_hud; } - static void renderAllHUD(); static void addPickable(std::set<LLViewerObject*> &pick_list); static void reshape(); @@ -144,6 +145,7 @@ private: ETextAlignment mTextAlignment; EVertAlignment mVertAlignment; S32 mLOD; + BOOL mHidden; static std::set<LLPointer<LLHUDText> > sTextObjects; static std::vector<LLPointer<LLHUDText> > sVisibleTextObjects; |