diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-21 10:58:23 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-21 10:58:23 -0400 |
| commit | ae5cf3cefaf6bf25f4478611505cbd58c5a3b112 (patch) | |
| tree | 5d6d6cf3bb925050232e2e28b7e5526963a5c3fc /indra/newview/llpanelteleporthistory.h | |
| parent | 7c06c9a3d1769758f5e01662d4e546178b490408 (diff) | |
| parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llpanelteleporthistory.h')
| -rw-r--r-- | indra/newview/llpanelteleporthistory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h index b5a025b39b..3d29454d15 100644 --- a/indra/newview/llpanelteleporthistory.h +++ b/indra/newview/llpanelteleporthistory.h @@ -38,6 +38,7 @@ class LLTeleportHistoryStorage; class LLAccordionCtrl; class LLAccordionCtrlTab; class LLFlatListView; +class LLMenuButton; class LLTeleportHistoryPanel : public LLPanelPlacesTab { @@ -94,7 +95,6 @@ private: void showTeleportHistory(); void handleItemSelect(LLFlatListView* ); LLFlatListView* getFlatListViewFromTab(LLAccordionCtrlTab *); - void onGearButtonClicked(); bool isActionEnabled(const LLSD& userdata) const; void setAccordionCollapsedByUser(LLUICtrl* acc_tab, bool collapsed); @@ -118,6 +118,7 @@ private: ContextMenu mContextMenu; LLContextMenu* mAccordionTabMenu; LLHandle<LLView> mGearMenuHandle; + LLMenuButton* mMenuGearButton; }; |