From 1140ae3489a9e260a0abb808b4152f2d57384d67 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Thu, 29 Dec 2022 19:51:33 +0100 Subject: Add a texture inspector and show it when hovering over an inventory textory (or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures --- indra/newview/llinventorypanel.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 552c61b915..d5dc8cdba6 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -168,6 +168,7 @@ public: void* cargo_data, EAcceptance* accept, std::string& tooltip_msg); + BOOL handleToolTip(S32 x, S32 y, MASK mask) override; // LLUICtrl methods /*virtual*/ void onFocusLost(); /*virtual*/ void onFocusReceived(); -- cgit v1.2.3 From aa6c7902af2ab2cc10bc86000a91078edafb522f Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 18 Jan 2023 05:03:00 +0200 Subject: SL-18988 OSX buildfix --- indra/newview/llinventorypanel.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index d5dc8cdba6..0932482ad7 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -159,23 +159,23 @@ public: LLFolderViewModelInventory& getRootViewModel() { return mInventoryViewModel; } // LLView methods - /*virtual*/ void onVisibilityChange(BOOL new_visibility); - void draw(); - /*virtual*/ BOOL handleKeyHere( KEY key, MASK mask ); - BOOL handleHover(S32 x, S32 y, MASK mask); + /*virtual*/ void onVisibilityChange(BOOL new_visibility) override; + void draw() override; + /*virtual*/ BOOL handleKeyHere( KEY key, MASK mask ) override; + BOOL handleHover(S32 x, S32 y, MASK mask) override; /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, - std::string& tooltip_msg); + std::string& tooltip_msg) override; BOOL handleToolTip(S32 x, S32 y, MASK mask) override; // LLUICtrl methods - /*virtual*/ void onFocusLost(); - /*virtual*/ void onFocusReceived(); + /*virtual*/ void onFocusLost() override; + /*virtual*/ void onFocusReceived() override; void onFolderOpening(const LLUUID &id); // LLBadgeHolder methods - bool addBadge(LLBadge * badge); + bool addBadge(LLBadge * badge) override; // Call this method to set the selection. void openAllFolders(); -- cgit v1.2.3 From 734b1b5d421254c45b3eb0fe0a5bbc8159e489fc Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Fri, 17 Feb 2023 15:47:03 +0200 Subject: SL-19105 WIP Single-folder inventory view --- indra/newview/llinventorypanel.h | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 0932482ad7..981bef62a8 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -222,6 +222,7 @@ public: void doCreate(const LLSD& userdata); bool beginIMSession(); void fileUploadLocation(const LLSD& userdata); + void openSingleViewInventory(const LLSD& userdata); void purgeSelectedItems(); bool attachObject(const LLSD& userdata); static void idle(void* user_data); @@ -263,6 +264,8 @@ public: void callbackPurgeSelectedItems(const LLSD& notification, const LLSD& response); + void changeFolderRoot(const LLUUID& new_id) {}; + protected: void openStartFolderOrMyInventory(); // open the first level of inventory void onItemsCompletion(); // called when selected items are complete @@ -382,6 +385,44 @@ private: std::deque mBuildViewsQueue; }; + +class LLInventorySingleFolderPanel : public LLInventoryPanel +{ +public: + struct Params : public LLInitParam::Block + {}; + + void initFromParams(const Params& p); + bool isSelectionRemovable() { return false; } + //void setSelectCallback(const boost::function& items, BOOL user_action)>& cb); + + void openInCurrentWindow(const LLSD& userdata); + void changeFolderRoot(const LLUUID& new_id); + void onForwardFolder(); + void onBackwardFolder(); + void clearNavigationHistory(); + LLUUID getSingleFolderRoot() { return mFolderID; } + + void setSelectCallback(const boost::function& items, BOOL user_action)>& cb); + + typedef boost::function root_changed_callback_t; + boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb); + +protected: + LLInventorySingleFolderPanel(const Params& params); + ~LLInventorySingleFolderPanel(); + void updateSingleFolderRoot(); + + boost::function& items, BOOL user_action)> mSelectionCallback; + friend class LLUICtrlFactory; + + LLUUID mFolderID; + std::list mBackwardFolders; + std::list mForwardFolders; + + boost::signals2::signal mRootChangedSignal; +}; + /************************************************************************/ /* Asset Pre-Filtered Inventory Panel related class */ /* Exchanges filter's flexibility for speed of generation and */ -- cgit v1.2.3 From 49da5288bd0425241823186bfd56a159fe2f9a60 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Fri, 24 Feb 2023 03:05:30 +0200 Subject: SL-19234 add Inventory settings floater --- indra/newview/llinventorypanel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 981bef62a8..baaefe5dd7 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -222,7 +222,7 @@ public: void doCreate(const LLSD& userdata); bool beginIMSession(); void fileUploadLocation(const LLSD& userdata); - void openSingleViewInventory(const LLSD& userdata); + void openSingleViewInventory(LLUUID folder_id = LLUUID()); void purgeSelectedItems(); bool attachObject(const LLSD& userdata); static void idle(void* user_data); -- cgit v1.2.3 From f377e27f0b8ddabf755c6efe71d6bc0e53e751c1 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Mon, 27 Feb 2023 20:27:11 +0200 Subject: SL-19274 Add new double-click option to Inventory settings --- indra/newview/llinventorypanel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index baaefe5dd7..e9eaaa232d 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -246,7 +246,7 @@ public: BOOL main_panel = FALSE, BOOL take_keyboard_focus = TAKE_FOCUS_YES, BOOL reset_filter = FALSE); - + static void setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id); void addItemID(const LLUUID& id, LLFolderViewItem* itemp); void removeItemID(const LLUUID& id); LLFolderViewItem* getItemByID(const LLUUID& id); -- cgit v1.2.3 From c74658b19b1ac28d5bf240e940a7ad97ff034e3c Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Thu, 2 Mar 2023 20:54:33 +0200 Subject: SL-19310 Update navigation buttons in single-folder view --- indra/newview/llinventorypanel.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index e9eaaa232d..31dd7aec23 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -403,6 +403,9 @@ public: void clearNavigationHistory(); LLUUID getSingleFolderRoot() { return mFolderID; } + bool isBackwardAvailable(); + bool isForwardAvailable(); + void setSelectCallback(const boost::function& items, BOOL user_action)>& cb); typedef boost::function root_changed_callback_t; -- cgit v1.2.3 From 1eab3247111e66a3b81153173d1624a5c1c9fb72 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 21 Mar 2023 17:47:26 +0200 Subject: SL-19379 WIP Gallery view Inventory: first pass --- indra/newview/llinventorypanel.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 31dd7aec23..b2c27daeec 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -406,6 +406,11 @@ public: bool isBackwardAvailable(); bool isForwardAvailable(); + void setNavBackwardList(std::list backward_list) { mBackwardFolders = backward_list; } + void setNavForwardList(std::list forward_list) { mForwardFolders = forward_list; } + std::list getNavBackwardList() { return mBackwardFolders; } + std::list getNavForwardList() { return mForwardFolders; } + void setSelectCallback(const boost::function& items, BOOL user_action)>& cb); typedef boost::function root_changed_callback_t; -- cgit v1.2.3 From 842bc87941d4574fe1ce34186872e43ecef881c3 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 12 Apr 2023 12:56:56 +0300 Subject: SL-19544 WIP update combination gallery visibility after changing filter --- indra/newview/llinventorypanel.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 136d9f75f6..2b152edada 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -394,7 +394,6 @@ public: void initFromParams(const Params& p); bool isSelectionRemovable() { return false; } - //void setSelectCallback(const boost::function& items, BOOL user_action)>& cb); void openInCurrentWindow(const LLSD& userdata); void changeFolderRoot(const LLUUID& new_id); -- cgit v1.2.3 From 37530c9d736d90ec29b97e3567346a02e2826f97 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 12 Apr 2023 21:11:36 +0300 Subject: SL-19544 WIP hide inventory pane in Combination view, if there is no visible items --- indra/newview/llinventorypanel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 2b152edada..abd5b4f20b 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -405,6 +405,8 @@ public: bool isBackwardAvailable(); bool isForwardAvailable(); + bool hasVisibleItems(); + void setNavBackwardList(std::list backward_list) { mBackwardFolders = backward_list; } void setNavForwardList(std::list forward_list) { mForwardFolders = forward_list; } std::list getNavBackwardList() { return mBackwardFolders; } -- cgit v1.2.3 From 873fcd3a0ba50bb06f8fc74dc516da6426280856 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 19 Apr 2023 22:06:00 +0300 Subject: SL-19621 Right click>New folder in List View should change root folder before creating new folder --- indra/newview/llinventorypanel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index abd5b4f20b..fb2419ada7 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -402,6 +402,8 @@ public: void clearNavigationHistory(); LLUUID getSingleFolderRoot() { return mFolderID; } + void doCreate(const LLSD& userdata); + bool isBackwardAvailable(); bool isForwardAvailable(); -- cgit v1.2.3 From 002ff88a130b16f03e26e159f7ea5f38782b16b6 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 2 May 2023 15:22:21 +0300 Subject: SL-19650 don't rebuild views right after initialising panel --- indra/newview/llinventorypanel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index fb2419ada7..d334d55611 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -107,6 +107,7 @@ public: Optional folder_view; Optional folder; Optional item; + Optional open_first_folder; // All item and folder views will be initialized on init if true (default) // Will initialize on visibility change otherwise. @@ -126,6 +127,7 @@ public: show_root_folder("show_root_folder", false), allow_drop_on_root("allow_drop_on_root", true), use_marketplace_folders("use_marketplace_folders", false), + open_first_folder("open_first_folder", true), scroll("scroll"), accepts_drag_and_drop("accepts_drag_and_drop"), folder_view("folder_view"), -- cgit v1.2.3 From b3e02c4264a8a3b9d189b347d0faddf3ac21e87b Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 3 May 2023 18:46:18 +0300 Subject: SL-19583 Scroll fixes --- indra/newview/llinventorypanel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index d334d55611..f2eab4a642 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -214,6 +214,7 @@ public: LLUUID getRootFolderID(); LLScrollContainer* getScrollableContainer() { return mScroller; } bool getAllowDropOnRoot() { return mParams.allow_drop_on_root; } + bool areViewsInitialized() { return mViewsInitialized == VIEWS_INITIALIZED && !mFolderRoot.get()->needsArrange(); } void onSelectionChange(const std::deque &items, BOOL user_action); @@ -455,7 +456,7 @@ public: void initFromParams(const Params& p); protected: - LLAssetFilteredInventoryPanel(const Params& p) : LLInventoryPanel(p) {} + LLAssetFilteredInventoryPanel(const Params& p); friend class LLUICtrlFactory; public: ~LLAssetFilteredInventoryPanel() {} -- cgit v1.2.3 From 4a09f190d55483857ad70b7d2ddb75a98f0f57d7 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 10 May 2023 16:02:14 +0300 Subject: SL-19650 don't build anything except direct children views for single-folder panel --- indra/newview/llinventorypanel.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index f2eab4a642..1476194195 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -305,6 +305,8 @@ protected: */ const LLInventoryFolderViewModelBuilder* mInvFVBridgeBuilder; + bool mBuildChildrenViews; + //-------------------------------------------------------------------- // Sorting @@ -372,7 +374,8 @@ private: LLInventoryObject const* objectp, LLFolderViewItem *target_view, LLFolderViewFolder *parent_folder_view, - const EBuildModes &mode); + const EBuildModes &mode, + S32 depth = -1); typedef enum e_views_initialization_state { -- cgit v1.2.3 From f7872f7ed1aaf42a6dc4a7999a554f428f6dfe60 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Thu, 11 May 2023 17:54:35 +0300 Subject: SL-19701 Clicking on 'Show' in inventory offering does not open inventory in Single folder --- indra/newview/llinventorypanel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 1476194195..f323a6c6d7 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -246,7 +246,7 @@ public: static void openInventoryPanelAndSetSelection(BOOL auto_open, const LLUUID& obj_id, - BOOL main_panel = FALSE, + BOOL use_main_panel = FALSE, BOOL take_keyboard_focus = TAKE_FOCUS_YES, BOOL reset_filter = FALSE); static void setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id); -- cgit v1.2.3 From 572e8269bcd5320daa66f4074e927c79869bf7de Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 24 May 2023 22:51:02 +0300 Subject: SL-19604 Creating new folders in combination views does not highlight created item --- indra/newview/llinventorypanel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index f323a6c6d7..7b54a5bbf2 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -421,6 +421,7 @@ public: std::list getNavForwardList() { return mForwardFolders; } void setSelectCallback(const boost::function& items, BOOL user_action)>& cb); + void setScroller(LLScrollContainer* scroller) { mExternalScroller = scroller; } typedef boost::function root_changed_callback_t; boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb); @@ -436,6 +437,7 @@ protected: LLUUID mFolderID; std::list mBackwardFolders; std::list mForwardFolders; + LLScrollContainer* mExternalScroller; boost::signals2::signal mRootChangedSignal; }; -- cgit v1.2.3 From 5c55adae47cab93a12793528373f639ea9e8efcf Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 30 May 2023 13:10:36 +0300 Subject: SL-19773 add context menu for root folder in single folder mode --- indra/newview/llinventorypanel.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 7b54a5bbf2..2754d79fbe 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -409,6 +409,7 @@ public: LLUUID getSingleFolderRoot() { return mFolderID; } void doCreate(const LLSD& userdata); + void doShare(); bool isBackwardAvailable(); bool isForwardAvailable(); -- cgit v1.2.3 From 1834cc1a8be0b4519d774ca52202677ccaf40933 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 31 May 2023 00:17:36 +0300 Subject: SL-19795 Creating folders in combination mode does not scroll to new folder --- indra/newview/llinventorypanel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 2754d79fbe..8d3edebcb4 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -422,7 +422,7 @@ public: std::list getNavForwardList() { return mForwardFolders; } void setSelectCallback(const boost::function& items, BOOL user_action)>& cb); - void setScroller(LLScrollContainer* scroller) { mExternalScroller = scroller; } + void setScroller(LLScrollContainer* scroller); typedef boost::function root_changed_callback_t; boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb); -- cgit v1.2.3 From 23311903106293f29e22d21314bdab03bbd499f7 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 31 May 2023 19:28:48 +0300 Subject: Revert "SL-19795 Unified scroll" --- indra/newview/llinventorypanel.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 8d3edebcb4..61d59e001e 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -214,7 +214,6 @@ public: LLUUID getRootFolderID(); LLScrollContainer* getScrollableContainer() { return mScroller; } bool getAllowDropOnRoot() { return mParams.allow_drop_on_root; } - bool areViewsInitialized() { return mViewsInitialized == VIEWS_INITIALIZED && !mFolderRoot.get()->needsArrange(); } void onSelectionChange(const std::deque &items, BOOL user_action); @@ -422,7 +421,6 @@ public: std::list getNavForwardList() { return mForwardFolders; } void setSelectCallback(const boost::function& items, BOOL user_action)>& cb); - void setScroller(LLScrollContainer* scroller); typedef boost::function root_changed_callback_t; boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb); @@ -438,7 +436,6 @@ protected: LLUUID mFolderID; std::list mBackwardFolders; std::list mForwardFolders; - LLScrollContainer* mExternalScroller; boost::signals2::signal mRootChangedSignal; }; -- cgit v1.2.3 From c6eeb65d18861ea346cf199faba7bf3f493fdabe Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 1 Jun 2023 00:14:06 +0300 Subject: SL-19795 Smarter combination inventory resizing --- indra/newview/llinventorypanel.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 61d59e001e..54ecdc8322 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -214,6 +214,7 @@ public: LLUUID getRootFolderID(); LLScrollContainer* getScrollableContainer() { return mScroller; } bool getAllowDropOnRoot() { return mParams.allow_drop_on_root; } + bool areViewsInitialized() { return mViewsInitialized == VIEWS_INITIALIZED && mFolderRoot.get() && !mFolderRoot.get()->needsArrange(); } void onSelectionChange(const std::deque &items, BOOL user_action); -- cgit v1.2.3 From 480aa58d159f7874bf3b388b7ea836debc23ceb1 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 7 Jun 2023 19:25:09 +0300 Subject: SL-19686 don't build inventory root views on init by default --- indra/newview/llinventorypanel.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 54ecdc8322..f4f6940743 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -268,6 +268,7 @@ public: static void callbackPurgeSelectedItems(const LLSD& notification, const LLSD& response, const std::vector inventory_selected); void changeFolderRoot(const LLUUID& new_id) {}; + void initFolderRoot(); protected: void openStartFolderOrMyInventory(); // open the first level of inventory @@ -306,6 +307,7 @@ protected: const LLInventoryFolderViewModelBuilder* mInvFVBridgeBuilder; bool mBuildChildrenViews; + bool mRootInited; //-------------------------------------------------------------------- @@ -401,6 +403,8 @@ public: void initFromParams(const Params& p); bool isSelectionRemovable() { return false; } + void initFolderRoot(const LLUUID& start_folder_id = LLUUID::null); + void openInCurrentWindow(const LLSD& userdata); void changeFolderRoot(const LLUUID& new_id); void onForwardFolder(); -- cgit v1.2.3 From c5979e11b6b18e893cc96b31498eb7a3a30e3780 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 7 Jun 2023 21:56:32 +0300 Subject: SL-19686 Fix selection callback --- indra/newview/llinventorypanel.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index f4f6940743..8d05fcb8b9 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -368,6 +368,8 @@ protected: virtual LLFolderView * createFolderRoot(LLUUID root_id ); virtual LLFolderViewFolder* createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop); virtual LLFolderViewItem* createFolderViewItem(LLInvFVBridge * bridge); + + boost::function& items, BOOL user_action)> mSelectionCallback; private: // buildViewsTree does not include some checks and is meant // for recursive use, use buildNewViews() for first call @@ -425,8 +427,6 @@ public: std::list getNavBackwardList() { return mBackwardFolders; } std::list getNavForwardList() { return mForwardFolders; } - void setSelectCallback(const boost::function& items, BOOL user_action)>& cb); - typedef boost::function root_changed_callback_t; boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb); @@ -435,7 +435,6 @@ protected: ~LLInventorySingleFolderPanel(); void updateSingleFolderRoot(); - boost::function& items, BOOL user_action)> mSelectionCallback; friend class LLUICtrlFactory; LLUUID mFolderID; -- cgit v1.2.3 From 71534d8fa7083355271eba69a7b6045f0c34463f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 14 Jun 2023 02:03:38 +0300 Subject: SL-19686 WIP Switching single folder view for large inventories causes stalls --- indra/newview/llinventorypanel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 8d05fcb8b9..20c9584015 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -269,6 +269,7 @@ public: void changeFolderRoot(const LLUUID& new_id) {}; void initFolderRoot(); + void initializeViewBuilding(); protected: void openStartFolderOrMyInventory(); // open the first level of inventory @@ -306,7 +307,7 @@ protected: */ const LLInventoryFolderViewModelBuilder* mInvFVBridgeBuilder; - bool mBuildChildrenViews; + bool mBuildChildrenViews; // build root and children bool mRootInited; -- cgit v1.2.3 From 7607047a95a8b1cb89e3007138fbb00986067c2b Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Fri, 16 Jun 2023 23:42:45 +0300 Subject: SL-19863 FIXED Items are not copied when attempting to paste into gallery mode --- indra/newview/llinventorypanel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorypanel.h') diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 20c9584015..341be0cf86 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -408,7 +408,6 @@ public: void initFolderRoot(const LLUUID& start_folder_id = LLUUID::null); - void openInCurrentWindow(const LLSD& userdata); void changeFolderRoot(const LLUUID& new_id); void onForwardFolder(); void onBackwardFolder(); @@ -416,6 +415,7 @@ public: LLUUID getSingleFolderRoot() { return mFolderID; } void doCreate(const LLSD& userdata); + void doToSelected(const LLSD& userdata); void doShare(); bool isBackwardAvailable(); -- cgit v1.2.3