From 7337b4b05bf2218796742a0ee1ddb0fdf27236c4 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 9 Mar 2010 15:23:16 -0800 Subject: More harmonization of LLHUDNameTag vs. LLHUDText Eliminating now-unused code from LLHUDText --- indra/newview/llhudtext.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'indra/newview/llhudtext.h') diff --git a/indra/newview/llhudtext.h b/indra/newview/llhudtext.h index 3acd2934e1..023c7d8ff3 100644 --- a/indra/newview/llhudtext.h +++ b/indra/newview/llhudtext.h @@ -40,7 +40,6 @@ #include "v4coloru.h" #include "v2math.h" #include "llrect.h" -#include "llframetimer.h" #include "llfontgl.h" #include #include @@ -100,8 +99,6 @@ public: // Add text a line at a time, allowing custom formatting void addLine(const std::string &text_utf8, const LLColor4& color, const LLFontGL::StyleFlags style = LLFontGL::NORMAL, const LLFontGL* font = NULL); - void setDropShadow(const BOOL do_shadow); - // Sets the default font for lines with no font specified void setFont(const LLFontGL* font); void setColor(const LLColor4 &color); @@ -122,7 +119,6 @@ public: /*virtual*/ void markDead(); friend class LLHUDObject; /*virtual*/ F32 getDistance() const { return mLastDistance; } - S32 getLOD() { return mLOD; } BOOL getVisible() { return mVisible; } BOOL getHidden() const { return mHidden; } void setHidden( BOOL hide ) { mHidden = hide; } @@ -141,14 +137,11 @@ protected: /*virtual*/ void renderForSelect(); void renderText(BOOL for_select); static void updateAll(); - void setLOD(S32 lod); S32 getMaxLines(); private: ~LLHUDText(); BOOL mOnHUDAttachment; -// BOOL mUseBubble; - BOOL mDropShadow; BOOL mDoFade; F32 mFadeRange; F32 mFadeDistance; @@ -172,11 +165,8 @@ private: S32 mOffsetY; F32 mRadius; std::vector mTextSegments; - std::vector mLabelSegments; - LLFrameTimer mResizeTimer; ETextAlignment mTextAlignment; EVertAlignment mVertAlignment; - S32 mLOD; BOOL mHidden; static BOOL sDisplayText ; -- cgit v1.2.3