summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-10-05 17:16:02 +0000
committerJames Cook <james@lindenlab.com>2009-10-05 17:16:02 +0000
commit440a0500723b4dec14a57202e89623ff91e34b1b (patch)
tree39b0a3ada7376353469ae95d45338c271e3dd228
parentf9788fa6ce0196ffaba6cdcb0fda3ef5cbfe3265 (diff)
Fix viewer-2 build due to duplicate lines in a header merge.
-rw-r--r--indra/newview/llpanelteleporthistory.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h
index ecbe281b7a..c4b7f995e0 100644
--- a/indra/newview/llpanelteleporthistory.h
+++ b/indra/newview/llpanelteleporthistory.h
@@ -82,9 +82,6 @@ private:
void onAccordionTabRightClick(LLView *view, S32 x, S32 y, MASK mask);
void onAccordionTabOpen(LLAccordionCtrlTab *tab);
void onAccordionTabClose(LLAccordionCtrlTab *tab);
- void onAccordionTabRightClick(LLView *view, S32 x, S32 y, MASK mask);
- void onAccordionTabOpen(LLAccordionCtrlTab *tab);
- void onAccordionTabClose(LLAccordionCtrlTab *tab);
void showTeleportHistory();
void handleItemSelect(LLFlatListView* );
LLFlatListView* getFlatListViewFromTab(LLAccordionCtrlTab *);