summaryrefslogtreecommitdiff
path: root/indra/newview/llhudnametag.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llhudnametag.h')
-rw-r--r--indra/newview/llhudnametag.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/llhudnametag.h b/indra/newview/llhudnametag.h
index 36d774cccf..9abd8f33cc 100644
--- a/indra/newview/llhudnametag.h
+++ b/indra/newview/llhudnametag.h
@@ -111,9 +111,9 @@ public:
void setFont(const LLFontGL* font);
void setColor(const LLColor4 &color);
void setAlpha(F32 alpha);
- void setZCompare(const BOOL zcompare);
- void setDoFade(const BOOL do_fade);
- void setVisibleOffScreen(BOOL visible) { mVisibleOffScreen = visible; }
+ void setZCompare(const bool zcompare);
+ void setDoFade(const bool do_fade);
+ void setVisibleOffScreen(bool visible) { mVisibleOffScreen = visible; }
// mMaxLines of -1 means unlimited lines.
void setMaxLines(S32 max_lines) { mMaxLines = max_lines; }
@@ -128,37 +128,37 @@ public:
friend class LLHUDObject;
/*virtual*/ F32 getDistance() const { return mLastDistance; }
S32 getLOD() const { return mLOD; }
- BOOL getVisible() const { return mVisible; }
- BOOL getHidden() const { return mHidden; }
- void setHidden( BOOL hide ) { mHidden = hide; }
+ bool getVisible() const { return mVisible; }
+ bool getHidden() const { return mHidden; }
+ void setHidden( bool hide ) { mHidden = hide; }
void shift(const LLVector3& offset);
F32 getWorldHeight() const;
- BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a& intersection, BOOL debug_render = FALSE);
+ bool lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a& intersection, bool debug_render = false);
static void shiftAll(const LLVector3& offset);
static void addPickable(std::set<LLViewerObject*> &pick_list);
static void reshape();
- static void setDisplayText(BOOL flag) { sDisplayText = flag ; }
+ static void setDisplayText(bool flag) { sDisplayText = flag ; }
protected:
LLHUDNameTag(const U8 type);
/*virtual*/ void render();
- void renderText(BOOL for_select);
+ void renderText(bool for_select);
static void updateAll();
void setLOD(S32 lod);
S32 getMaxLines();
private:
~LLHUDNameTag();
- BOOL mDoFade;
+ bool mDoFade;
F32 mFadeRange;
F32 mFadeDistance;
F32 mLastDistance;
- BOOL mZCompare;
- BOOL mVisibleOffScreen;
- BOOL mOffscreen;
+ bool mZCompare;
+ bool mVisibleOffScreen;
+ bool mOffscreen;
LLColor4 mColor;
// LLVector3 mScale;
F32 mWidth;
@@ -180,11 +180,11 @@ private:
ETextAlignment mTextAlignment;
EVertAlignment mVertAlignment;
S32 mLOD;
- BOOL mHidden;
+ bool mHidden;
LLPointer<LLUIImage> mRoundedRectImgp;
LLPointer<LLUIImage> mRoundedRectTopImgp;
- static BOOL sDisplayText ;
+ static bool sDisplayText ;
static std::set<LLPointer<LLHUDNameTag> > sTextObjects;
static std::vector<LLPointer<LLHUDNameTag> > sVisibleTextObjects;
// static std::vector<LLPointer<LLHUDNameTag> > sVisibleHUDTextObjects;