summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.h
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
committerBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
commitc4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch)
tree96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/newview/llviewermenu.h
parentb0c449d301299a4ba1b7d83e930f9df6b071b931 (diff)
parentcdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff)
viewer-development merge
Diffstat (limited to 'indra/newview/llviewermenu.h')
-rw-r--r--indra/newview/llviewermenu.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index 3515aa4302..2eb458fa02 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -49,7 +49,6 @@ void show_context_menu( S32 x, S32 y, MASK mask );
void show_build_mode_context_menu(S32 x, S32 y, MASK mask);
void show_navbar_context_menu(LLView* ctrl, S32 x, S32 y);
void show_topinfobar_context_menu(LLView* ctrl, S32 x, S32 y);
-BOOL enable_save_into_inventory(void*);
void handle_reset_view();
void handle_cut(void*);
void handle_copy(void*);
@@ -159,8 +158,6 @@ protected:
LLSafeHandle<LLObjectSelection> mObjectSelection;
};
-extern const std::string SAVE_INTO_INVENTORY;
-
extern LLMenuBarGL* gMenuBarView;
//extern LLView* gMenuBarHolder;
extern LLMenuGL* gEditMenu;