diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 17:06:06 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 19:25:02 +0300 |
| commit | 0dcc912cecdfb365c1f4246545ece40ccb7bc18e (patch) | |
| tree | ccf664c765d1adbbf4985069321df65c85ca36e2 /indra/newview/lldensityctrl.h | |
| parent | bd8438f7083643ae5812b14e35e69e69ef1616c6 (diff) | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
Merge main into inventory_favorites
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/newview/lldensityctrl.h')
| -rw-r--r-- | indra/newview/lldensityctrl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldensityctrl.h b/indra/newview/lldensityctrl.h index 789022803c..1bc0f0ef1a 100644 --- a/indra/newview/lldensityctrl.h +++ b/indra/newview/lldensityctrl.h @@ -70,8 +70,8 @@ public: Params(); }; - virtual BOOL postBuild() override; - virtual void setEnabled(BOOL enabled) override; + virtual BOOL postBuild() override; + virtual void setEnabled(BOOL enabled) override; void setProfileType(DensityProfileType t) { mProfileType = t; } |