diff options
author | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
commit | 7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd (patch) | |
tree | 0243666021de3ae6ac61a6c6f4e57d42771fe964 /linden/indra/newview/llhudtext.h | |
parent | Applied BlockClickSit debug setting from Emerald to block sit click action (diff) | |
download | meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.zip meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.gz meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.bz2 meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.xz |
Merged in jacek/next
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llhudtext.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linden/indra/newview/llhudtext.h b/linden/indra/newview/llhudtext.h index 6e29d9d..c68a975 100644 --- a/linden/indra/newview/llhudtext.h +++ b/linden/indra/newview/llhudtext.h | |||
@@ -130,6 +130,11 @@ public: | |||
130 | static void addPickable(std::set<LLViewerObject*> &pick_list); | 130 | static void addPickable(std::set<LLViewerObject*> &pick_list); |
131 | static void reshape(); | 131 | static void reshape(); |
132 | static void setDisplayText(BOOL flag) { sDisplayText = flag ; } | 132 | static void setDisplayText(BOOL flag) { sDisplayText = flag ; } |
133 | // [RLVa:KB] - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f | ||
134 | const std::string& getObjectText() const { return mObjText; } | ||
135 | void setObjectText(const std::string &utf8string) { mObjText = utf8string; } | ||
136 | static void refreshAllObjectText(); | ||
137 | // [/RLVa:KB] | ||
133 | protected: | 138 | protected: |
134 | LLHUDText(const U8 type); | 139 | LLHUDText(const U8 type); |
135 | 140 | ||
@@ -175,6 +180,9 @@ private: | |||
175 | EVertAlignment mVertAlignment; | 180 | EVertAlignment mVertAlignment; |
176 | S32 mLOD; | 181 | S32 mLOD; |
177 | BOOL mHidden; | 182 | BOOL mHidden; |
183 | // [RLVa:KB] - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f | ||
184 | std::string mObjText; | ||
185 | // [/RLVa:KB] | ||
178 | 186 | ||
179 | static BOOL sDisplayText ; | 187 | static BOOL sDisplayText ; |
180 | static std::set<LLPointer<LLHUDText> > sTextObjects; | 188 | static std::set<LLPointer<LLHUDText> > sTextObjects; |