diff options
| author | Tofu Buzzard <no-email> | 2010-10-25 23:29:49 +0100 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-10-25 23:29:49 +0100 |
| commit | 26700e0d40c5f650e713f5209dd80b5df84b2b5a (patch) | |
| tree | 03fe24d0bb133c03bfe0b4afe14eeaea90fa0d44 /indra/newview/llpanelteleporthistory.h | |
| parent | ad033a4b35387a343f2204cda64ecb590888b60e (diff) | |
| parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
merge 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; }; |