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/llpaneleditwearable.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/llpaneleditwearable.h')
| -rw-r--r-- | indra/newview/llpaneleditwearable.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index 5a40e945c2..77619b5987 100644 --- a/indra/newview/llpaneleditwearable.h +++ b/indra/newview/llpaneleditwearable.h @@ -51,8 +51,8 @@ public: LLPanelEditWearable( ); virtual ~LLPanelEditWearable(); - /*virtual*/ BOOL postBuild(); - /*virtual*/ BOOL isDirty() const; // LLUICtrl + /*virtual*/ bool postBuild(); + /*virtual*/ bool isDirty() const; // LLUICtrl /*virtual*/ void draw(); void onClose(); @@ -60,7 +60,7 @@ public: void changeCamera(U8 subpart); LLViewerWearable* getWearable() { return mWearablePtr; } - void setWearable(LLViewerWearable *wearable, BOOL disable_camera_switch = FALSE); + void setWearable(LLViewerWearable *wearable, bool disable_camera_switch = false); void saveChanges(bool force_save_as = false); void revertChanges(); @@ -76,12 +76,12 @@ public: void onSaveAsButtonClicked(); void saveAsCallback(const LLSD& notification, const LLSD& response); - virtual void setVisible(BOOL visible); + virtual void setVisible(bool visible); private: typedef std::map<F32, LLViewerVisualParam*> value_map_t; - void showWearable(LLViewerWearable* wearable, BOOL show, BOOL disable_camera_switch = FALSE); + void showWearable(LLViewerWearable* wearable, bool show, bool disable_camera_switch = false); void updateScrollingPanelUI(); LLPanel* getPanel(LLWearableType::EType type); void getSortedParams(value_map_t &sorted_params, const std::string &edit_group); @@ -106,7 +106,7 @@ private: bool changeHeightUnits(const LLSD& new_value); // updates current metric and replacement metric label text - void updateMetricLayout(BOOL new_value); + void updateMetricLayout(bool new_value); // updates avatar height label void updateAvatarHeightLabel(); |