diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
| commit | 23f2631d598b6e07450a96ed1ec00670c8867cdd (patch) | |
| tree | 20195c1688ad8cb7e8631c97fa5920624f10972c /indra/newview/lltoolobjpicker.h | |
| parent | 54334ff6e377e35c97df3a0fe2a859795ec07b21 (diff) | |
| parent | 8ce3323269d95f54e2b768c4c5aa154d4afbbb6b (diff) | |
Merge branch 'develop' into nat/edu-channel
Diffstat (limited to 'indra/newview/lltoolobjpicker.h')
| -rw-r--r-- | indra/newview/lltoolobjpicker.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h index ceeb45c74e..3420541a31 100644 --- a/indra/newview/lltoolobjpicker.h +++ b/indra/newview/lltoolobjpicker.h @@ -38,9 +38,9 @@ class LLToolObjPicker : public LLTool, public LLSingleton<LLToolObjPicker> LLSINGLETON(LLToolObjPicker); public: - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) override; - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask) override; - virtual BOOL handleHover(S32 x, S32 y, MASK mask) override; + virtual bool handleMouseDown(S32 x, S32 y, MASK mask) override; + virtual bool handleMouseUp(S32 x, S32 y, MASK mask) override; + virtual bool handleHover(S32 x, S32 y, MASK mask) override; virtual void handleSelect() override; virtual void handleDeselect() override; @@ -54,7 +54,7 @@ public: static void pickCallback(const LLPickInfo& pick_info); protected: - BOOL mPicked; + bool mPicked; LLUUID mHitObjectID; void (*mExitCallback)(void *callback_data); void *mExitCallbackData; |