diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-10 20:03:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 20:03:54 +0300 |
| commit | f74c10c4ec6435471bac84473fe865f90843c2df (patch) | |
| tree | b2853d87789dbb84d6c26c259eab6639d3a7e482 /indra/newview/llpanelavatartag.h | |
| parent | 5fccb539937a52d286274a002266e022e2102e5e (diff) | |
| parent | 32fcefc058ae38eff0572326ef3efd1c7b343144 (diff) | |
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing
Diffstat (limited to 'indra/newview/llpanelavatartag.h')
| -rw-r--r-- | indra/newview/llpanelavatartag.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelavatartag.h b/indra/newview/llpanelavatartag.h index a14b7e9dd2..fbc50386a6 100644 --- a/indra/newview/llpanelavatartag.h +++ b/indra/newview/llpanelavatartag.h @@ -57,12 +57,12 @@ public: const LLUUID& getAvatarId() const { return mAvatarId; } - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); /*virtual*/ void draw(); virtual boost::signals2::connection setLeftButtonClickCallback( const commit_callback_t& cb); - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); void onClick(); private: @@ -75,7 +75,7 @@ private: const LLUUID& id, const std::string& first, const std::string& last, - BOOL is_group); + bool is_group); LLAvatarIconCtrl* mIcon; /// status tracking avatar icon LLTextBox* mName; /// displays avatar name |