diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:17:37 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:17:37 +0300 |
| commit | a9a63db0f08bcf5c2593bc8b6c7ab6e532376988 (patch) | |
| tree | 6a246a607b5b4c3fb15f1d0826a468c6b57c5d4b /indra/newview/llpanellandmarks.h | |
| parent | e3ef38876b9951af3ea8052fb02db46212c76965 (diff) | |
| parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) | |
Merge branch 'master' into DRTVWR-548-maint-N
Diffstat (limited to 'indra/newview/llpanellandmarks.h')
| -rw-r--r-- | indra/newview/llpanellandmarks.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index d7408269b5..16f3a5dc24 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -34,7 +34,6 @@ #include "llinventorymodel.h" #include "lllandmarklist.h" #include "llpanelplacestab.h" -#include "llpanelpick.h" #include "llremoteparcelrequest.h" class LLAccordionCtrlTab; @@ -136,7 +135,6 @@ private: * For now it checks cut/rename/delete/paste actions. */ bool canItemBeModified(const std::string& command_name, LLFolderViewItem* item) const; - void onPickPanelExit( LLPanelPickEdit* pick_panel, LLView* owner, const LLSD& params); /** * Landmark actions callbacks. Fire when a landmark is loaded from the list. |