From 7fa86e04d6ce9081e364d67ffd4efd010eb46d81 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 6 Feb 2024 01:21:10 +0200 Subject: SL-19730 Bulk Pick Up Single Items --- indra/newview/llviewermenu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewermenu.h') diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index 7142763451..b1ab7a2688 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -103,7 +103,7 @@ bool enable_object_delete(); // Buy either contents or object itself void handle_buy(); -void handle_take(); +void handle_take(bool take_separate = false); void handle_take_copy(); void handle_look_at_selection(const LLSD& param); void handle_zoom_to_object(LLUUID object_id); -- cgit v1.2.3 From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llviewermenu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewermenu.h') diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index b1ab7a2688..63044bd057 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -160,7 +160,7 @@ public: LLViewerMenuHolderGL(const Params& p); - virtual BOOL hideMenus(); + virtual bool hideMenus(); void setParcelSelection(LLSafeHandle selection); void setObjectSelection(LLSafeHandle selection); -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/llviewermenu.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview/llviewermenu.h') diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index 63044bd057..8c87a1d389 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -61,27 +61,27 @@ void handle_deselect(void*); void handle_delete_object(); void handle_duplicate(void*); void handle_duplicate_in_place(void*); -BOOL enable_not_have_card(void *userdata); +bool enable_not_have_card(void *userdata); void process_grant_godlike_powers(LLMessageSystem* msg, void**); -BOOL enable_cut(void*); -BOOL enable_copy(void*); -BOOL enable_paste(void*); -BOOL enable_select_all(void*); -BOOL enable_deselect(void*); -BOOL enable_undo(void*); -BOOL enable_redo(void*); +bool enable_cut(void*); +bool enable_copy(void*); +bool enable_paste(void*); +bool enable_select_all(void*); +bool enable_deselect(void*); +bool enable_undo(void*); +bool enable_redo(void*); -BOOL is_agent_mappable(const LLUUID& agent_id); +bool is_agent_mappable(const LLUUID& agent_id); void confirm_replace_attachment(S32 option, void* user_data); void handle_detach_from_avatar(const LLSD& user_data); void attach_label(std::string& label, const LLSD&); void detach_label(std::string& label, const LLSD&); void handle_detach(void*); -BOOL enable_god_full(void* user_data); -BOOL enable_god_liaison(void* user_data); -BOOL enable_god_basic(void* user_data); +bool enable_god_full(void* user_data); +bool enable_god_liaison(void* user_data); +bool enable_god_basic(void* user_data); void check_merchant_status(bool force = false); void exchange_callingcard(const LLUUID& dest_id); -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llviewermenu.h | 420 +++++++++++++++++++++---------------------- 1 file changed, 210 insertions(+), 210 deletions(-) (limited to 'indra/newview/llviewermenu.h') diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index fce6a29eb2..8c5e0705d0 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -1,210 +1,210 @@ -/** - * @file llviewermenu.h - * @brief Builds menus out of objects - * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLVIEWERMENU_H -#define LL_LLVIEWERMENU_H - -#include "../llui/llmenugl.h" -#include "llsafehandle.h" - -class LLMessageSystem; -class LLSD; -class LLUICtrl; -class LLView; -class LLParcelSelection; -class LLObjectSelection; -class LLSelectNode; - -void initialize_edit_menu(); -void initialize_spellcheck_menu(); -void init_menus(); -void cleanup_menus(); - -void show_debug_menus(); // checks for if menus should be shown first. -void toggle_debug_menus(void*); -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); -void handle_reset_view(); -void handle_cut(void*); -void handle_copy(void*); -void handle_paste(void*); -void handle_delete(void*); -void handle_redo(void*); -void handle_undo(void*); -void handle_select_all(void*); -void handle_deselect(void*); -void handle_delete_object(); -void handle_duplicate(void*); -void handle_duplicate_in_place(void*); -bool enable_not_have_card(void *userdata); -void process_grant_godlike_powers(LLMessageSystem* msg, void**); - -bool enable_cut(void*); -bool enable_copy(void*); -bool enable_paste(void*); -bool enable_select_all(void*); -bool enable_deselect(void*); -bool enable_undo(void*); -bool enable_redo(void*); - -bool is_agent_mappable(const LLUUID& agent_id); - -void confirm_replace_attachment(S32 option, void* user_data); -void handle_detach_from_avatar(const LLSD& user_data); -void attach_label(std::string& label, const LLSD&); -void detach_label(std::string& label, const LLSD&); -void handle_detach(void*); -bool enable_god_full(void* user_data); -bool enable_god_liaison(void* user_data); -bool enable_god_basic(void* user_data); -void check_merchant_status(bool force = false); - -void exchange_callingcard(const LLUUID& dest_id); - -void handle_gestures(void*); -void handle_sit_down(void*); -void handle_object_build(void*); -void handle_object_touch(); -bool enable_object_edit_gltf_material(); -bool enable_object_save_gltf_material(); -bool enable_object_open(); -void handle_object_open(); - -bool visible_take_object(); -bool tools_visible_take_object(); -bool enable_object_take_copy(); -bool enable_object_return(); -bool enable_object_delete(); - -// Buy either contents or object itself -void handle_buy(); -void handle_take(bool take_separate = false); -void handle_take_copy(); -void handle_look_at_selection(const LLSD& param); -void handle_zoom_to_object(LLUUID object_id); -void handle_object_return(); -void handle_object_delete(); -void handle_object_edit(); -void handle_object_edit_gltf_material(); -void handle_object_save_gltf_material(); - -void handle_attachment_edit(const LLUUID& inv_item_id); -void handle_attachment_touch(const LLUUID& inv_item_id); -bool enable_attachment_touch(const LLUUID& inv_item_id); - -void handle_buy_land(); - -// Takes avatar UUID, or if no UUID passed, uses last selected object -void handle_avatar_freeze(const LLSD& avatar_id); - -// Takes avatar UUID, or if no UUID passed, uses last selected object -void handle_avatar_eject(const LLSD& avatar_id); - -bool enable_freeze_eject(const LLSD& avatar_id); - -// Can anyone take a free copy of the object? -// *TODO: Move to separate file -bool anyone_copy_selection(LLSelectNode* nodep); - -// Is this selected object for sale? -// *TODO: Move to separate file -bool for_sale_selection(LLSelectNode* nodep); - -void handle_toggle_flycam(); - -void handle_object_sit_or_stand(); -void handle_object_sit(const LLUUID& object_id); -void handle_give_money_dialog(); -bool enable_pay_object(); -bool enable_buy_object(); -bool handle_go_to(); - -// Export to XML or Collada -void handle_export_selected( void * ); - -// Convert strings to internal types -U32 render_type_from_string(std::string render_type); -U32 feature_from_string(std::string feature); -U64 info_display_from_string(std::string info_display); - -class LLViewerMenuHolderGL : public LLMenuHolderGL -{ -public: - struct Params : public LLInitParam::Block - {}; - - LLViewerMenuHolderGL(const Params& p); - - virtual bool hideMenus(); - - void setParcelSelection(LLSafeHandle selection); - void setObjectSelection(LLSafeHandle selection); - - virtual const LLRect getMenuRect() const; - -protected: - LLSafeHandle mParcelSelection; - LLSafeHandle mObjectSelection; -}; - -extern LLMenuBarGL* gMenuBarView; -//extern LLView* gMenuBarHolder; -extern LLMenuGL* gEditMenu; -extern LLMenuGL* gPopupMenuView; -extern LLViewerMenuHolderGL* gMenuHolder; -extern LLMenuBarGL* gLoginMenuBarView; - -// Context menus in 3D scene -extern LLContextMenu *gMenuAvatarSelf; -extern LLContextMenu *gMenuAvatarOther; -extern LLContextMenu *gMenuObject; -extern LLContextMenu *gMenuAttachmentSelf; -extern LLContextMenu *gMenuAttachmentOther; -extern LLContextMenu *gMenuLand; -extern LLContextMenu *gMenuMuteParticle; - -// Needed to build menus when attachment site list available -extern LLMenuGL* gAttachSubMenu; -extern LLMenuGL* gDetachSubMenu; -extern LLMenuGL* gTakeOffClothes; -extern LLMenuGL* gDetachAvatarMenu; -extern LLMenuGL* gDetachHUDAvatarMenu; -extern LLContextMenu* gAttachScreenPieMenu; -extern LLContextMenu* gDetachScreenPieMenu; -extern LLContextMenu* gDetachHUDAttSelfMenu; -extern LLContextMenu* gAttachPieMenu; -extern LLContextMenu* gDetachPieMenu; -extern LLContextMenu* gDetachAttSelfMenu; -extern LLContextMenu* gAttachBodyPartPieMenus[9]; -extern LLContextMenu* gDetachBodyPartPieMenus[9]; - -extern LLMenuItemCallGL* gMutePieMenu; -extern LLMenuItemCallGL* gMuteObjectPieMenu; -extern LLMenuItemCallGL* gBuyPassPieMenu; - -#endif +/** + * @file llviewermenu.h + * @brief Builds menus out of objects + * + * $LicenseInfo:firstyear=2002&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLVIEWERMENU_H +#define LL_LLVIEWERMENU_H + +#include "../llui/llmenugl.h" +#include "llsafehandle.h" + +class LLMessageSystem; +class LLSD; +class LLUICtrl; +class LLView; +class LLParcelSelection; +class LLObjectSelection; +class LLSelectNode; + +void initialize_edit_menu(); +void initialize_spellcheck_menu(); +void init_menus(); +void cleanup_menus(); + +void show_debug_menus(); // checks for if menus should be shown first. +void toggle_debug_menus(void*); +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); +void handle_reset_view(); +void handle_cut(void*); +void handle_copy(void*); +void handle_paste(void*); +void handle_delete(void*); +void handle_redo(void*); +void handle_undo(void*); +void handle_select_all(void*); +void handle_deselect(void*); +void handle_delete_object(); +void handle_duplicate(void*); +void handle_duplicate_in_place(void*); +bool enable_not_have_card(void *userdata); +void process_grant_godlike_powers(LLMessageSystem* msg, void**); + +bool enable_cut(void*); +bool enable_copy(void*); +bool enable_paste(void*); +bool enable_select_all(void*); +bool enable_deselect(void*); +bool enable_undo(void*); +bool enable_redo(void*); + +bool is_agent_mappable(const LLUUID& agent_id); + +void confirm_replace_attachment(S32 option, void* user_data); +void handle_detach_from_avatar(const LLSD& user_data); +void attach_label(std::string& label, const LLSD&); +void detach_label(std::string& label, const LLSD&); +void handle_detach(void*); +bool enable_god_full(void* user_data); +bool enable_god_liaison(void* user_data); +bool enable_god_basic(void* user_data); +void check_merchant_status(bool force = false); + +void exchange_callingcard(const LLUUID& dest_id); + +void handle_gestures(void*); +void handle_sit_down(void*); +void handle_object_build(void*); +void handle_object_touch(); +bool enable_object_edit_gltf_material(); +bool enable_object_save_gltf_material(); +bool enable_object_open(); +void handle_object_open(); + +bool visible_take_object(); +bool tools_visible_take_object(); +bool enable_object_take_copy(); +bool enable_object_return(); +bool enable_object_delete(); + +// Buy either contents or object itself +void handle_buy(); +void handle_take(bool take_separate = false); +void handle_take_copy(); +void handle_look_at_selection(const LLSD& param); +void handle_zoom_to_object(LLUUID object_id); +void handle_object_return(); +void handle_object_delete(); +void handle_object_edit(); +void handle_object_edit_gltf_material(); +void handle_object_save_gltf_material(); + +void handle_attachment_edit(const LLUUID& inv_item_id); +void handle_attachment_touch(const LLUUID& inv_item_id); +bool enable_attachment_touch(const LLUUID& inv_item_id); + +void handle_buy_land(); + +// Takes avatar UUID, or if no UUID passed, uses last selected object +void handle_avatar_freeze(const LLSD& avatar_id); + +// Takes avatar UUID, or if no UUID passed, uses last selected object +void handle_avatar_eject(const LLSD& avatar_id); + +bool enable_freeze_eject(const LLSD& avatar_id); + +// Can anyone take a free copy of the object? +// *TODO: Move to separate file +bool anyone_copy_selection(LLSelectNode* nodep); + +// Is this selected object for sale? +// *TODO: Move to separate file +bool for_sale_selection(LLSelectNode* nodep); + +void handle_toggle_flycam(); + +void handle_object_sit_or_stand(); +void handle_object_sit(const LLUUID& object_id); +void handle_give_money_dialog(); +bool enable_pay_object(); +bool enable_buy_object(); +bool handle_go_to(); + +// Export to XML or Collada +void handle_export_selected( void * ); + +// Convert strings to internal types +U32 render_type_from_string(std::string render_type); +U32 feature_from_string(std::string feature); +U64 info_display_from_string(std::string info_display); + +class LLViewerMenuHolderGL : public LLMenuHolderGL +{ +public: + struct Params : public LLInitParam::Block + {}; + + LLViewerMenuHolderGL(const Params& p); + + virtual bool hideMenus(); + + void setParcelSelection(LLSafeHandle selection); + void setObjectSelection(LLSafeHandle selection); + + virtual const LLRect getMenuRect() const; + +protected: + LLSafeHandle mParcelSelection; + LLSafeHandle mObjectSelection; +}; + +extern LLMenuBarGL* gMenuBarView; +//extern LLView* gMenuBarHolder; +extern LLMenuGL* gEditMenu; +extern LLMenuGL* gPopupMenuView; +extern LLViewerMenuHolderGL* gMenuHolder; +extern LLMenuBarGL* gLoginMenuBarView; + +// Context menus in 3D scene +extern LLContextMenu *gMenuAvatarSelf; +extern LLContextMenu *gMenuAvatarOther; +extern LLContextMenu *gMenuObject; +extern LLContextMenu *gMenuAttachmentSelf; +extern LLContextMenu *gMenuAttachmentOther; +extern LLContextMenu *gMenuLand; +extern LLContextMenu *gMenuMuteParticle; + +// Needed to build menus when attachment site list available +extern LLMenuGL* gAttachSubMenu; +extern LLMenuGL* gDetachSubMenu; +extern LLMenuGL* gTakeOffClothes; +extern LLMenuGL* gDetachAvatarMenu; +extern LLMenuGL* gDetachHUDAvatarMenu; +extern LLContextMenu* gAttachScreenPieMenu; +extern LLContextMenu* gDetachScreenPieMenu; +extern LLContextMenu* gDetachHUDAttSelfMenu; +extern LLContextMenu* gAttachPieMenu; +extern LLContextMenu* gDetachPieMenu; +extern LLContextMenu* gDetachAttSelfMenu; +extern LLContextMenu* gAttachBodyPartPieMenus[9]; +extern LLContextMenu* gDetachBodyPartPieMenus[9]; + +extern LLMenuItemCallGL* gMutePieMenu; +extern LLMenuItemCallGL* gMuteObjectPieMenu; +extern LLMenuItemCallGL* gBuyPassPieMenu; + +#endif -- cgit v1.2.3