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/llpanelobject.h | |
| parent | 5fccb539937a52d286274a002266e022e2102e5e (diff) | |
| parent | 32fcefc058ae38eff0572326ef3efd1c7b343144 (diff) | |
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing
Diffstat (limited to 'indra/newview/llpanelobject.h')
| -rw-r--r-- | indra/newview/llpanelobject.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 3754dd3040..bbc069b96f 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -51,7 +51,7 @@ public: LLPanelObject(); virtual ~LLPanelObject(); - virtual BOOL postBuild(); + virtual bool postBuild(); virtual void draw(); virtual void clearCtrls(); @@ -81,7 +81,7 @@ public: void onCommitSculpt(const LLSD& data); void onCancelSculpt(const LLSD& data); void onSelectSculpt(const LLSD& data); - BOOL onDropSculpt(LLInventoryItem* item); + bool onDropSculpt(LLInventoryItem* item); static void onCommitSculptType( LLUICtrl *ctrl, void* userdata); void menuDoToSelected(const LLSD& userdata); @@ -90,9 +90,9 @@ public: protected: void getState(); - void sendRotation(BOOL btn_down); - void sendScale(BOOL btn_down); - void sendPosition(BOOL btn_down); + void sendRotation(bool btn_down); + void sendScale(bool btn_down); + void sendPosition(bool btn_down); void sendIsPhysical(); void sendIsTemporary(); void sendIsPhantom(); @@ -155,7 +155,7 @@ protected: LLSpinCtrl* mCtrlScaleX; LLSpinCtrl* mCtrlScaleY; LLSpinCtrl* mCtrlScaleZ; - BOOL mSizeChanged; + bool mSizeChanged; LLMenuButton* mMenuClipboardRot; LLTextBox* mLabelRotation; @@ -175,9 +175,9 @@ protected: LLCheckBoxCtrl *mCtrlSculptInvert; LLVector3 mCurEulerDegrees; // to avoid sending rotation when not changed - BOOL mIsPhysical; // to avoid sending "physical" when not changed - BOOL mIsTemporary; // to avoid sending "temporary" when not changed - BOOL mIsPhantom; // to avoid sending "phantom" when not changed + bool mIsPhysical; // to avoid sending "physical" when not changed + bool mIsTemporary; // to avoid sending "temporary" when not changed + bool mIsPhantom; // to avoid sending "phantom" when not changed S32 mSelectedType; // So we know what selected type we last were LLUUID mSculptTextureRevert; // so we can revert the sculpt texture on cancel |