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/llmoveview.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/llmoveview.h')
| -rw-r--r-- | indra/newview/llmoveview.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h index e8b9a6fdb2..f58596842d 100644 --- a/indra/newview/llmoveview.h +++ b/indra/newview/llmoveview.h @@ -48,14 +48,14 @@ private: ~LLFloaterMove(); public: - /*virtual*/ BOOL postBuild(); - /*virtual*/ void setVisible(BOOL visible); + /*virtual*/ bool postBuild(); + /*virtual*/ void setVisible(bool visible); static F32 getYawRate(F32 time); - static void setFlyingMode(BOOL fly); - void setFlyingModeImpl(BOOL fly); + static void setFlyingMode(bool fly); + void setFlyingModeImpl(bool fly); static void setAlwaysRunMode(bool run); void setAlwaysRunModeImpl(bool run); - static void setSittingMode(BOOL bSitting); + static void setSittingMode(bool bSitting); static void enableInstance(); /*virtual*/ void onOpen(const LLSD& key); @@ -86,7 +86,7 @@ private: void initModeButtonMap(); void setModeButtonToggleState(const EMovementMode mode); void updateButtonsWithMovementMode(const EMovementMode newMode); - void showModeButtons(BOOL bShow); + void showModeButtons(bool bShow); public: @@ -141,13 +141,13 @@ public: static LLPanelStandStopFlying* getInstance(); static void setStandStopFlyingMode(EStandStopFlyingMode mode); static void clearStandStopFlyingMode(EStandStopFlyingMode mode); - /*virtual*/ BOOL postBuild(); - /*virtual*/ void setVisible(BOOL visible); + /*virtual*/ bool postBuild(); + /*virtual*/ void setVisible(bool visible); // *HACK: due to hard enough to have this control aligned with "Move" button while resizing // let update its position in each frame /*virtual*/ void draw(){updatePosition(); LLPanel::draw();} - /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleToolTip(S32 x, S32 y, MASK mask); protected: |