diff options
Diffstat (limited to 'indra/newview/lltoolpipette.h')
-rw-r--r-- | indra/newview/lltoolpipette.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h index 44d06f5383..0f1574f2d5 100644 --- a/indra/newview/lltoolpipette.h +++ b/indra/newview/lltoolpipette.h @@ -47,15 +47,15 @@ class LLToolPipette virtual ~LLToolPipette(); 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 handleToolTip(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 bool handleToolTip(S32 x, S32 y, MASK mask) override; // Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t; void setToolSelectCallback(const signal_t::slot_type& cb) { mSignal.connect(cb); } - void setResult(BOOL success, const std::string& msg); + void setResult(bool success, const std::string& msg); void setTextureEntry(const LLTextureEntry* entry); static void pickCallback(const LLPickInfo& pick_info); @@ -63,7 +63,7 @@ public: protected: LLTextureEntry mTextureEntry; signal_t mSignal; - BOOL mSuccess; + bool mSuccess; std::string mTooltipMsg; }; |