diff options
Diffstat (limited to 'linden/indra/llui/llview.h')
-rw-r--r-- | linden/indra/llui/llview.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h index 63c1efc..8248d50 100644 --- a/linden/indra/llui/llview.h +++ b/linden/indra/llui/llview.h | |||
@@ -45,6 +45,7 @@ | |||
45 | #include "llstring.h" | 45 | #include "llstring.h" |
46 | #include "llrect.h" | 46 | #include "llrect.h" |
47 | #include "llui.h" | 47 | #include "llui.h" |
48 | #include "lluistring.h" | ||
48 | #include "lluixmltags.h" | 49 | #include "lluixmltags.h" |
49 | #include "llviewquery.h" | 50 | #include "llviewquery.h" |
50 | #include "llxmlnode.h" | 51 | #include "llxmlnode.h" |
@@ -154,7 +155,7 @@ protected: | |||
154 | BOOL mEnabled; // Enabled means "accepts input that has an effect on the state of the application." | 155 | BOOL mEnabled; // Enabled means "accepts input that has an effect on the state of the application." |
155 | // A disabled view, for example, may still have a scrollbar that responds to mouse events. | 156 | // A disabled view, for example, may still have a scrollbar that responds to mouse events. |
156 | BOOL mMouseOpaque; // Opaque views handle all mouse events that are over their rect. | 157 | BOOL mMouseOpaque; // Opaque views handle all mouse events that are over their rect. |
157 | LLString mToolTipMsg; // isNull() is true if none. | 158 | LLUIString mToolTipMsg; // isNull() is true if none. |
158 | 159 | ||
159 | U8 mSoundFlags; | 160 | U8 mSoundFlags; |
160 | BOOL mSaveToXML; | 161 | BOOL mSaveToXML; |
@@ -214,7 +215,8 @@ public: | |||
214 | // MANIPULATORS | 215 | // MANIPULATORS |
215 | // | 216 | // |
216 | void setMouseOpaque( BOOL b ); | 217 | void setMouseOpaque( BOOL b ); |
217 | void setToolTip( const LLString& msg ); | 218 | void setToolTip( const LLStringExplicit& msg ); |
219 | BOOL setToolTipArg( const LLStringExplicit& key, const LLStringExplicit& text ); | ||
218 | 220 | ||
219 | virtual void setRect(const LLRect &rect); | 221 | virtual void setRect(const LLRect &rect); |
220 | void setFollows(U32 flags); | 222 | void setFollows(U32 flags); |