diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/lltoolselectland.h | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/lltoolselectland.h')
| -rw-r--r-- | indra/newview/lltoolselectland.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/lltoolselectland.h b/indra/newview/lltoolselectland.h index 88bc4e2e3d..893bf970d1 100644 --- a/indra/newview/lltoolselectland.h +++ b/indra/newview/lltoolselectland.h @@ -39,24 +39,24 @@ class LLToolSelectLand virtual ~LLToolSelectLand(); public: - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override; - /*virtual*/ BOOL handleDoubleClick(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 handleDoubleClick(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 render() override; // draw the select rectangle - /*virtual*/ BOOL isAlwaysRendered() override { return TRUE; } + /*virtual*/ bool isAlwaysRendered() override { return true; } /*virtual*/ void handleSelect() override; /*virtual*/ void handleDeselect() override; protected: - BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); + bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); void roundXY(LLVector3d& vec); protected: LLVector3d mDragStartGlobal; // global coords LLVector3d mDragEndGlobal; // global coords - BOOL mDragEndValid; // is drag end a valid point in the world? + bool mDragEndValid; // is drag end a valid point in the world? S32 mDragStartX; // screen coords, from left S32 mDragStartY; // screen coords, from bottom @@ -64,7 +64,7 @@ protected: S32 mDragEndX; S32 mDragEndY; - BOOL mMouseOutsideSlop; // has mouse ever gone outside slop region? + bool mMouseOutsideSlop; // has mouse ever gone outside slop region? LLVector3d mWestSouthBottom; // global coords, from drag LLVector3d mEastNorthTop; // global coords, from drag |