aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewermenu.h')
-rw-r--r--linden/indra/newview/llviewermenu.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 9847e41..0c42426 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -37,6 +37,8 @@
37 37
38class LLUICtrl; 38class LLUICtrl;
39class LLView; 39class LLView;
40class LLParcelSelection;
41class LLObjectSelection;
40 42
41struct LLResourceData 43struct LLResourceData
42{ 44{
@@ -85,7 +87,6 @@ BOOL is_agent_mappable(const LLUUID& agent_id);
85 87
86void menu_toggle_control( void* user_data ); 88void menu_toggle_control( void* user_data );
87void check_toggle_control( LLUICtrl *, void* user_data ); 89void check_toggle_control( LLUICtrl *, void* user_data );
88void handle_attach_to_avatar(void* user_data);
89void confirm_replace_attachment(S32 option, void* user_data); 90void confirm_replace_attachment(S32 option, void* user_data);
90void handle_detach_from_avatar(void* user_data); 91void handle_detach_from_avatar(void* user_data);
91void attach_label(LLString& label, void* user_data); 92void attach_label(LLString& label, void* user_data);
@@ -145,10 +146,18 @@ class LLPermissions;
145class LLViewerMenuHolderGL : public LLMenuHolderGL 146class LLViewerMenuHolderGL : public LLMenuHolderGL
146{ 147{
147public: 148public:
148 LLViewerMenuHolderGL() : LLMenuHolderGL() {}; 149 LLViewerMenuHolderGL();
149 150
150 virtual BOOL hideMenus(); 151 virtual BOOL hideMenus();
151 //virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); 152
153 void setParcelSelection(LLHandle<LLParcelSelection> selection);
154 void setObjectSelection(LLHandle<LLObjectSelection> selection);
155
156 virtual const LLRect getMenuRect() const;
157
158protected:
159 LLHandle<LLParcelSelection> mParcelSelection;
160 LLHandle<LLObjectSelection> mObjectSelection;
152}; 161};
153 162
154extern const LLString SAVE_INTO_INVENTORY; 163extern const LLString SAVE_INTO_INVENTORY;