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/llpanelteleporthistory.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/llpanelteleporthistory.h')
| -rw-r--r-- | indra/newview/llpanelteleporthistory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h index 058fee0170..62d5dfe009 100644 --- a/indra/newview/llpanelteleporthistory.h +++ b/indra/newview/llpanelteleporthistory.h @@ -46,7 +46,7 @@ public: LLTeleportHistoryPanel(); virtual ~LLTeleportHistoryPanel(); - BOOL postBuild() override; + bool postBuild() override; void draw() override; void onSearchEdit(const std::string& string) override; @@ -62,7 +62,7 @@ public: LLToggleableMenu* getSortingMenu() override; LLToggleableMenu* getCreateMenu() override; - bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept) override { return false; } + bool handleDragAndDropToTrash(bool drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept) override { return false; } private: |