0291b82f94
DD-243 : Set up callbacks for merchant outbox importer in the postBuild
2014-10-24 22:46:26 -07:00
c58af95410
DD-170 : Set the import callback for Merchant Outbox only when clicking the import button
2014-10-19 21:53:07 -07:00
68b62747ed
Pull merge from lindenlab/viewer-release
2014-05-30 14:19:53 -07:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
a65ea2f5a0
DD-40 : WIP : Refactor marketplace listings UI classes in their own cpp / h files
2014-03-25 13:41:40 -07:00
f813a25224
DD-10 : WIP : Some XUI clean up, menu still not working
2014-03-25 10:22:10 -07:00
5b08828728
DD-16 : WIP : More code on sort/show menu but still not actionable.
2014-03-21 15:43:07 -07:00
d11a15b6dd
DD-16 : WIP : Update sort / show menu, not actionable yet though
2014-03-20 16:39:30 -07:00
03622e0833
DD-50 : Adding new filter code for marketplace filtered tabs (active, unactive and unassociated)
2014-03-20 09:31:35 -07:00
d9747b3f82
DD-50 : WIP : Add tabs to the marketplace listing UI
2014-03-18 16:36:50 -07:00
e08296f6dc
DD-40 : WIP : Got rid o the useless Drop Target text (not part of that UI)
2014-03-18 15:14:09 -07:00
28fe835254
DD-17, DD-40 : Style active listings in bold, implement a working initialization indicator
2014-03-18 13:03:04 -07:00
68dbb5692f
DD-17 : WIP : Add live status to active listing folders, clean up getLabelSuffix() code a bit
2014-03-14 17:34:15 -07:00
705d4182c8
DD-42 : Rename merchant items to marketplace listings to be consistent with spec
2014-03-13 16:45:52 -07:00
9de02b0cd3
DD-17 : WIP : some work on the suffix for Listing folders
2014-03-10 18:49:40 -07:00
00fe1b7fbe
DD-3 : WIP : Add test data to LLMarketplaceData when opening the floater for the first time
2014-03-10 11:44:40 -07:00
93da0cea62
DD-7 : Initialize the Merchant Items floater checking the is a Merchant status correctly. No indication it's initializing (UI) but the code works
2014-03-06 19:12:25 -08:00
a030b30d34
DD-4, DD-5, DD-6, DD-7, DD-8: WIP : Add Merchant Items panel and make it somewhat work, in a clunky sort of way
2014-03-06 18:15:51 -08:00
66dff9d93b
ACME-1220 : Fixed. Do not accumulate callbacks when reinitializing market place
2013-11-26 20:17:23 -08:00
125f3f071a
MAINT-3319 : WIP : Introduce a consolidate folder method used for Merchant Outbox
2013-11-18 16:03:22 -08:00
6ec99570cd
MAINT-3320 : Fixed! Inventory panels are not resistant to folder root deletion, using handle instead of pointer and cleaning things consistently
2013-11-15 15:12:11 -08:00
148c3780e1
MAINT-3320 : WIP : Introduced a cleanOutbox() method to be called on outbox deletion
2013-11-13 13:29:51 -08:00
e6b4b89bf1
MAINT-3320 : WIP : Use handle for elements that'll get deleted under us, quite a bit of debug spam to clean later
2013-11-11 18:39:02 -08:00
c2f5365f98
Pull merge from lindenlab/viewer-release
2013-10-14 16:30:08 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
6a8e22cf02
MAINT-2301 : Change messaging in the Merchant Outbox panel when an error happened, so not to be confused with the not-a-merchant case.
2013-02-15 14:02:33 -08:00
677f65b3a2
MAINT-2301 : WIP : Catch a bit more 4xx and 5xx error codes, display the error code in the alert.
2013-01-31 20:26:59 -08:00
c8e76908d7
MAINT-2287 : Fixed : Test the merchant/no merchant status without relying on outbox, Recreate missing outbox for a merchant, UI clean up on init.
2013-01-28 18:32:47 -08:00
9da625d439
CHUI-494: WIP First pass at getting the suppression of events in DND working.
2012-12-06 20:28:25 -08:00
a204059d2e
CHUI-267 FIX Full inventory listing not always shown for test account
...
changed LLFolderViewModelInterface::getFilter() to return a reference, since it is never NULL
removed sort order from filter, which was causing unneeded filtering
2012-08-01 01:14:27 -07:00
4285cc271e
CHUI-217 FIX Items are not visible in Merchant Outbox
...
cleaned up a lot custom code for folder view item creation in inbox and outbox
proper initialization of views from inventory panel starting folder
2012-07-30 15:15:42 -07:00
379eec8841
CHUI-101 WIP Make LLFolderView general purpose
...
continuing fixing build errors
renamed llfoldervieweventlistener.h to llfolderviewmodel.h
2012-06-15 13:35:39 -07:00
9940ca5ae7
CHUI-101 WIP Make LLFolderView general purpose
...
llfolderview refactornig
2012-06-15 09:44:27 -07:00
734153b639
CHUI-96 FIX Cannot dismiss modal dialogs related to merchant outbox
2012-04-24 18:38:49 -07:00
1ea65f0285
CHUI-51 WIP notifications routig code cleanup
...
phase 1, removal of most of llnotificationhandler
2012-03-27 22:56:02 -07:00
bb79bbf320
EXP-1827 FIX -- Drag area in outbox does not always highlight green when indicating a top level drop
...
* Updated the outbox drop area highlight to include top level drops within the
outbox inventory panel itself.
2012-01-19 13:53:48 -08:00
b18d54be9f
EXP-1816 FIX -- Drag area in outbox can remain highlighted after drag and drop ends
...
* Added handleHover function to clear highlight
2012-01-18 13:11:57 -08:00
d6add298d7
EXP-1802 FIX -- Create labeled drop target region at bottom of merchant outbox floater for easy top level drop access
...
* Added generic drop zone that highlights green when its functionality will be used.
2012-01-13 16:06:58 -08:00
59950f6178
EXP-1778 FIX -- Link to Marketplace Error log in transfer failed viewer notification
...
* Added a link to the "imports" log from the "done with errors" notification when
sending folders to the marketplace.
2012-01-11 16:49:32 -08:00
0a1cb4f03e
EXP-1791 FIX -- Handle case where initialization with SLM fails in the Merchant Outbox floater in the viewer
...
* Updated marketplace import to properly handle failed cases of authentications
and invalid cookies. The import will reset to an uninitialized state and then
trigger and initialization followed immediately by an import when appropriate.
2012-01-11 11:26:56 -08:00
00b767e5a9
EXP-1791 - Handle case where initialization with SLM fails in the Merchant Outbox floater in the viewer
...
* Added code to clear and re-initialize the SLM cookie when authentication errors are encountered.
* Re-organized logic for outbox import a bit to hopefully be more robust when errors are encountered.
2012-01-11 10:05:15 -08:00
af32a74b77
EXP-1757 FIX -- Merchant Outbox shows as empty when first opening/initializing even when populated
...
* Updated merchant outbox floater to not wait for initialization to complete before displaying outbox inventory contents.
2012-01-05 16:30:15 -08:00
912833bafa
EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would create a hierarchy that contains too many folders
...
* Updated drag and drop to correctly handle moving to and from outbox as opposed to within the outbox when dealing with
folder and item count limitations related to depth and total folder count.
2012-01-04 14:04:32 -08:00
744484699c
EXP-1749 FIX -- Merchant outbox import completion messages are to be modal dialogs
...
* Merchant outbox completion messages now shown as modal dialogs rather than window shades.
2011-12-19 17:29:17 -08:00
6c26fdea4d
EXP-1741 FIX -- Learn more link goes to page not found from Outbox for user that is not a merchant an Agni
...
EXP-1746 FIX -- Update Outbox messaging
EXP-1748 FIX -- Close down on messaging with Spinner
MKT-3403 support -- viewer tooltips updated to match errors in marketplace
* Copy has been updated to match the design per Leo and Brooke
* Marketplace URL's have also been updated
* The outbox floater now reports a status string in the existing folder count control
2011-12-19 16:46:26 -08:00
399f8dd191
EXP-1723 -- Improved drag and drop behavior for outbox floater.
2011-12-14 14:37:38 -08:00
bb39e3fa3c
EXP-1718 FIX -- Drag and drop within the outbox can result in folders being out of order
...
* Outbox updates now result in a resort to keep drag and drop items and folders properly sorted
* New icon for merchant outbox
* New behavior to accept drag and drop files over the entire merchant outbox floater
2011-12-13 16:42:14 -08:00
d7fabfee19
EXP-1715 FIX -- Merchant outbox drag and drop has offset between mouse position and selected folder
...
EXP-1717 FIX -- Drag and drop within the outbox can result in an item created at the top level of the outbox
Folders are now created for items dragged around within the merchant outbox if their drop target is the top level outbox inventory panel itself.
2011-12-13 13:56:41 -08:00
181eaa8196
EXP-1648 FIX
...
* Merchant outbox no longer crashes for non-merchants.
* Folder count is hidden for non-merchants.
* Drag and drop to merchant outbox floater is disabled for non-merchants.
2011-12-12 17:22:47 -08:00
Merov Linden