diff options
author | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-23 18:35:27 +0200 |
---|---|---|
committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-23 18:35:27 +0200 |
commit | 425fd9c6e0f68630191078a34a05bed518156efb (patch) | |
tree | 18f98bc84082213a503ff84e3fcb7262b43a77e8 /indra/newview/llpanellandmarks.h | |
parent | 40b8a7a3284daa90d3b0e278e8afb5b80b544d0d (diff) |
Fixed normal bug EXT-3299 "Can't drag and drop landmarks into an empty favorites folder through landmarksSP"
- Added drag and drop for empty inventory panel. Dropped item gets to
the root folder.
- Fixed issue with empty "Landmarks" inventory panel not displaying "No
matching items..." message.
- Removed accordion updating and hiding in idle routine. This invalidates EXT-2346 "My Landmarks accordion panels shouldn't be displayed if there are no landmarks in respective folders"
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanellandmarks.h')
-rw-r--r-- | indra/newview/llpanellandmarks.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index b0e537f647..590fa395b6 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -72,6 +72,12 @@ public: */ void saveFolderStateIfNoFilter(); + /** + * Update filter ShowFolderState setting to show empty folder message + * if Landmarks inventory folder is empty. + */ + void updateShowFolderState(); + protected: /** * @return true - if current selected panel is not null and selected item is a landmark @@ -112,13 +118,6 @@ private: void onCustomAction(const LLSD& command_name); /** - * Updates accordions according to filtered items in lists. - * - * It hides accordion for empty lists - */ - void updateFilteredAccordions(); - - /** * Determines if selected item can be modified via context/gear menu. * * It validates Places Landmarks rules first. And then LLFolderView permissions. @@ -133,11 +132,6 @@ private: bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, EAcceptance* accept); /** - * Static callback for gIdleCallbacks to perform actions out of drawing - */ - static void doIdle(void* landmarks_panel); - - /** * Landmark actions callbacks. Fire when a landmark is loaded from the list. */ void doShowOnMap(LLLandmark* landmark); |