Commit Graph

86 Commits (0b3756aeab22656fd13fa9ccdda0397561ba4ca3)

Author SHA1 Message Date
Nicky 1714747536 After merge compare FS tree agsindt V/dev.
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Leslie Linden 5dcdb2dd02 EXP-1548 FIX -- Clicking show on inventory offer does not open inventory (or received items panel) on test grid Ravi set to use Received Items folder for transfers
EXP-1555 FIX -- Double-click is inconsistent between inventory and Received Items
EXP-1547 FIX -- drag/drop inventory to agent - delivers to Objects, not Received items.

* "Show" button from p2p transfer now opens inventory window and inbox panel, setting focus to the item
* Double-click on inbox inventory items now falls through to default item behavior
2011-11-07 14:43:59 -08:00
Leslie Linden 130d017085 * Updated inventory code to handle creation of the "Received Items" panel when
the sim notifies the viewer that the folder is created.  Unfortunately, the
  sim is not yet doing this so a relog is required to properly get this working.
2011-10-31 12:01:10 -07:00
Leslie Linden 0ff49e798c EXP-1359 FIX -- Selecting New Inventory window from gear menu in Inventory panel opens old My Inventory panel
* Removed old inventory panel.
* Renamed new inventory panel from "my_inventory" to "inventory"

Reviewed by Richard.
2011-10-17 15:18:19 -07:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Merov Linden 3a473bd8ca EXP-1203, EXP-1221, EXP-1222, EXP-1223, EXP-1225, EXP-1226 : pull from sergeylproductengine/viewer-experience-fui/ 2011-09-27 18:56:25 -07:00
Seth ProductEngine 0f3221e25d EXP-1225 FIXED Added a floater for My Inventory side tab.
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
- Added LLFloaterSidePanelContainer::getPanel<T>() for getting custom type panels.
2011-09-27 21:05:05 +03:00
Leslie Linden ba96fb5c2b EXP-1199 FIX -- Inbox new tag sometimes differs from recent item delivery times, sim timezone settings differences suspected.
* LastInventoryInboxActivity setting now stored as the value of time_correct(),
  the corrected time difference (established at login) between the client and
  official SL time.
2011-09-12 16:06:58 -07:00
Leslie Linden 4ad3676985 Disable merchant outbox context menu 2011-09-08 12:09:43 -07:00
Leslie Linden 6bb2b2cb99 EXP-1194 FIX -- Update New tag behavior to update Newness timestamp when Received Items panel is open and do not auto open Received Items panel
* Updated inbox freshness time setting name to "LastInventoryInboxActivity"
* New time stamp reflects time of last activity performed on the inbox by the user
* Selection and opening items in the inbox both count as activity on the inbox
* Focus going to the inbox panel counts as activity on the inbox
* Creation date of folders now computed based on date of items being added to them
* Creation date of folders no longer relies on queries for creation date, as is done during sorting
* Folders are assumed to be "new" if no inbox freshness time setting is saved
2011-09-07 12:45:50 -07:00
Leslie Linden b18390f0f8 * Disabling outbox for now. 2011-09-06 13:27:19 -07:00
Leslie Linden b3a2bd0d4d EXP-1194 FIX -- Update New tag behavior to update Newness timestamp when Received Items panel is open and do not auto open Received Items panel
* The inbox no longer auto-expands under any condition.
* Changed new-ness timestamp from "LastInventoryInboxCollapse" to "LastInventoryInboxExpansion" to eschew obfuscation.
* "LastInventoryInboxExpansion" now saved out when user opens the panel.
2011-09-06 12:44:03 -07:00
Leslie Linden 02658d9725 EXP-1001 FIX -- Newness is removed on next login if you log out or crash before opening inventory panel
EXP-1148 FIX -- New Tags can show in incorrect locations when opening folder with drop down arrow in Received Items panel
EXP-1163 FIX -- When ordering a Direct Delivery item in Basic Mode, item is not shown as new on login to Advanced mode
EXP-1172 FIX -- New tags not displayed for items delivered while not logged in on next login to viewer
EXP-1173 FIX -- New tags are removed for all new items when Inventory side panel is opened

* New tag now set when an item folder is added to the inbox.
* Update to new tag only happens when a valid date exists.
* Inbox collapsed time now only set when inbox panel is in a visible chain.
2011-09-01 16:12:39 -07:00
leslie@leslie-HPz600.lindenlab.com c2443b95d3 EXP-1126 FIX -- Cannot use arrow keys to scroll up and down in Inbox and Outbox
EXP-1003 FIX -- Renaming a folder in Received Items panel resets the New flag for that folder
EXP-1001 FIX -- Newness is removed on next login if you log out or crash before opening inventory panel
EXP-857 FIX -- Add context menu entries as alternate path to populate outbox
EXP-858 FIX -- Outbox sync failure error handling
EXP-1158 FIX -- Viewer crash when deleting items from Outbox when some folders are open

* Made inbox, outbox and inventory panels all legit tab stops for keyboard focus
* Added mouse over indication on inventory panel primarily for increased clarity on outbox error messages
* Disabled "Rename" option on inbox items
* Added context menu option to copy/move an item to the merchant outbox
* Context menu option to copy/move to outbox is visible and/or enabled/disabled when appropriate
* "LastInventoryInboxCollapse" no longer written out as a setting when the panel is not visible
* Fixed up collapse time check to not try to parse empty string on first load (deminishes text spam in log greatly)
* Disabled double-click as a way to equip items in the inbox or outbox
* Viewer code no longer removes items from the outbox after sync.  We rely on the sim to do this now.
* Basic outbox sync error handling now displays error messages as tooltips along with badge over item in outbox
* Moved some scroll container default values out of code and into xml
2011-08-26 16:33:47 -07:00
Leslie Linden 7b09592bf9 EXP-840 FIX -- Create outbox panels to help the user get started on the marketplace and to indicate drag and drop targets.
EXP-858 PROGRESS -- Outbox sync failure error handling
EXP-908 FIX -- Hide outbox when appropriate
EXP-1062 FIX -- Add modal dialog for outbox sync complete
EXP-1096 FIX -- Extra space below Received Items panel for an account that does not have a Merchant Account setup, no outbox display
EXP-1104 FIX -- User can activate Merchant Outbox synch button when outbox is empty

* Added separate class for outbox view to support error tag rendering
* Added confirmation for sync complete.
* Added different outbox messages for empty outbox, non-merchant and error: merchant but no outbox
* Progress on a bunch of other fronts.
2011-08-19 16:20:29 -07:00
Leyla Farazha 10ec004912 merge from viewer-experience 2011-08-12 14:53:25 -07:00
Richard Linden b215c724c1 Automated merge with http://hg.secondlife.com/viewer-development 2011-08-11 10:11:59 -07:00
Leslie Linden b6685b5872 EXP-1065 FIX -- Inventory has slowed to a crawl. Clicking between items has an average one second delay. Same with switching between tabs.
* Removed numerous places in the code that called findChild across the inventory panel unnecessarily.
* Conglomerated uses of inbox and outbox inventory panels to the sidepanel class so the pointers can be cached and functionality like selection handling can be done more efficiently.
* Optimized LLView::childHasKeyboardFocus() to work backwards up from the focus object rather than searching for children that may or may not turn out to have focus.

Reviewed by Richard.
2011-08-08 15:13:53 -07:00
leslie@leslie-HPz600.lindenlab.com db45317cae EXP-863 FIX -- Add Outbox sync button that performs marketplace sync
EXP-908 FIX -- Hide outbox when appropriate
EXP-1035 FIX -- Allow user to remove items from outbox
EXP-1000 FIX -- New icon can cover long names in Received Items Panel
EXP-1001 FIX -- Newness is removed on next login if you log out or crash before opening inventory panel
EXP-1008 UPDATE -- Extra space at bottom of Inventory panel when Inbox/outbox not displayed

* Updated "New" tag to properly display over long names per Epic's design
* "New" tags now compare vs last inbox collapse time rather than expansion time
* Marketplace inventory panels now have their own layout stack

Reviewed by Leyla
2011-08-05 11:12:27 -07:00
leslie@leslie-HPz600.lindenlab.com 45bf1debaa * Fixed up outbox UI alignment to match inbox
* Added outbox item count to outbox button title
* Updated sync loading indicator to keep moving until http request complete
* Updated outbox panel display to use user_status http get response
* Removed inbox/outbox folder name hack from LLInventoryPanel
2011-08-02 13:12:39 -07:00
Leslie Linden 5b89ba6942 Removed unused variable for build fix. 2011-07-20 11:35:38 -07:00
Leyla Farazha 892ca49503 EXP-1001 Newness is removed on next login if you log out or crash before opening inventory panel
EXP-1002 Single order purchase does not open Received Items panel by default if Inventory panel open when delivered
2011-07-14 15:05:07 -07:00
Leyla Farazha aa9564953b EXP-998 Logging in with different user can remove newness for incorrect user 2011-07-14 10:57:23 -07:00
Leslie Linden 7bed421611 Disabling outbox panel display logic for the time being. 2011-07-08 09:23:37 -07:00
Leslie Linden 8e9fd4bdf2 EXP-985 FIX -- Always show Inbox panel if "Received Items" folder exists
The presence of the inbox folder now forces the "Received Items" folder to be visible.
The same logic applies to the outbox as well.

Reviewed by Richard.
2011-07-07 12:58:06 -07:00
Leslie Linden 6c12a5ca55 EXP-919 FIX -- Items not shown in Received Items panel
EXP-929 FIX -- First Direct Delivery item purchased while logged in: Received Items folder visible in inventory and item not visible in Received items panel - no badge count update

* Inbox and Outbox inventory panels now live in their own XML files and are hot loaded into place when appropriate, like when the "Received Items" folder is first created, for example.
* The Inbox and Outbox panels now show relevant default messages when the folders are empty or do not exist
* Added LLInventoryCategoryAddedObserver, a new inventory observer type to observe added folders
* Hacked LLInventoryPanel to properly set up inbox and outbox inventory views for the "Received Items" folder and the "Merchant Outbox" folder that aren't created with the proper system folder type
* Changed inventory badge count computation to use LLFolderView rather than the inventory directly
* Applied various focus, selection and other inbox fixes to the outbox

Reviewed by Richard.
2011-06-30 16:25:19 -07:00
Leyla Farazha 3a3d0661b8 EXP-962 Share button in Inventory Recent tab blinks when no recent items are listed 2011-06-30 14:58:36 -07:00
Leslie Linden e74f9fcc14 EXP-919 FIX -- Toggling InventoryDisplayInbox value to True in Viewer on Agni creates Inbox and Outbox system folders
* The badge no longer displays (2) when the folder does not exist.
* The inbox panel no longer displays the inventory and library folders.
* The inbox is supposed to display a string for the item not being found, but doesn't for an unknown reason.
2011-06-23 18:11:55 -04:00
Leyla Farazha b84881382b merge and fixing linux build issues 2011-06-22 16:18:23 -07:00
Leyla Farazha 5999574c10 making it so that inbox shows up quicker 2011-06-22 16:12:01 -07:00
Leslie Linden 57017a7a6e EXP-920 FIX -- Received Items panel is not opened if closed when a new Direct Delivery items is delivered when user has Inventory panel open
* Mac build fix by removing an unused variable
* Inbox panel now auto-expands when new item delivered

Reviewed by Richard
2011-06-22 14:26:15 -04:00
Leyla Farazha e2f9276a08 EXP-877 Profile button not active when selecting items in Marketplace inbox 2011-06-21 15:18:05 -07:00
Leyla Farazha 149b160a6d EXP-872 Hide inbox unless applicable 2011-06-20 18:14:26 -07:00
Leslie Linden 6215e6ba25 EXP-872 PROGRESS -- Hide inbox unless applicable
* Updated to use the current user's agent id instead of Pup's

Reviewed by Leyla :)
2011-06-17 13:22:13 -07:00
Leslie Linden 0d246c0c5f EXP-872 PROGRESS -- Hide Inbox unless applicable
EXP-910 FIX -- Newness badge shown on suitcase inventory icon when InventoryDisplayInbox is set to False
EXP-895 FIX -- Selecting items in Marketplace Inbox does not change focus in inventory panel away from items selected in inventory panel

* Main inventory, outbox and inbox all clear the selection of the others when they gain focus
* The Fresh Item Count badge is no longer displayed on the inventory side tab button when the inbox is disabled
* The New Item Count text is no longer displayed.  (we will enable it again when freshness is supported)
2011-06-16 17:14:51 -07:00
Leslie Linden 5e3d344fba EXP-872 FIX -- Hide inbox and outbox unless applicable
EXP-893 FIX -- Single order purchases not sorted with most recent item delivered at top of list
EXP-904 FIX -- Newness/Freshness value out of synch with new items in Inbox on next login when ordering in bulk with Inventory window open

* Inbox and outbox can now be forced on by setting the debug variables "InventoryDisplayInbox" and "InventoryDisplayOutbox"
* Inbox is only displayed when logging into a grid that has a marketplace that returns pup as a merchant
* Inbox contents is now a forced download when the user logs in, rather than the typical lazy load of the rest of the inventory

Reviewed by Leyla
2011-06-15 16:21:19 -07:00
Leslie Linden 142c2fc29c EXP-896 FIX -- Inbox not opened by default when new items are received
EXP-894 FIX -- When scrolling to the bottom of the inbox, the last item is c...
EXP-856 FIX -- Inbox item count reflected as badge on inventory button

* Inbox auto-expands when "fresh" items are reported
* Logic for "fresh" item determination is still in progress but works for purchases while logged in
* Badges now only displayed when the inventory side panel is collapsed or when inventory not visible

Reviewed by Leyla
2011-06-14 16:35:15 -07:00
Leslie Linden de78d17e91 Merge from viewer-experience 2011-06-08 13:41:40 -07:00
Leslie Linden 98bcd9e2ef EXP-859 FIX -- Save setting for last time inbox expanded
EXP-841 PROGRESS -- Create outbox sync button with basic enable/disable logic and animation
EXP-866 PROGRESS -- Create inbox observer to dynamically update inbox item count and badge value
EXP-872 PROGRESS -- Hide inbox and outbox unless applicable

Inbox expansion time is now saved as setting variable "LastInventoryInboxExpand".

New outbox sync button art.

Observers for items and categories are now implemented in the LLSidepanelInventory but the exact
method of use is still to be determined.

Functions are in place to show and hide the inbox and outbox panels but the logic around the
decision is TBD.

The resize bar for the inbox/outbox is now disabled when both inbox and outbox are collapsed.

Reviewed by Leyla.
2011-06-06 17:00:59 -07:00
Leslie Linden 651a9587f8 EXP-862 FIX -- Disable marketplace inbox/outbox panel separator when inbox and outbox are collapsed
Marketplace panel is only resizable now when inbox or outbox is expanded.

Reviewed by Leyla
2011-06-01 13:50:14 -07:00
Leslie Linden 33e4a2c7b1 Updated Marketplace Inbox & Outbox panel to maintain size when one is expanded vs the other 2011-05-25 10:39:34 -07:00
Leyla Farazha 95b8020d21 adding marketplace inbox and outbox
reviewed by Leslie
2011-05-23 16:11:50 -07:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Leslie Linden a3298c978c EXP-1065 FIX -- Inventory has slowed to a crawl. Clicking between items has an average one second delay. Same with switching between tabs.
* Removed numerous places in the code that called findChild across the inventory panel unnecessarily.
* Conglomerated uses of inbox and outbox inventory panels to the sidepanel class so the pointers can be cached and functionality like selection handling can be done more efficiently.
* Optimized LLView::childHasKeyboardFocus() to work backwards up from the focus object rather than searching for children that may or may not turn out to have focus.

Reviewed by Richard.
2011-08-08 15:13:53 -07:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Arrehn c2b21ae7d1 FIRE-906 , Inventory takes focus on launch 2011-05-18 01:14:02 -04:00
ziree d63630d722 FIRE-942: Fixed collapse/Expand buttons on detached inventory windows, added filter clear on collapse. 2011-05-04 16:04:58 +02:00
Kadah dc43fff820 FIRE-436: Added collapse and expand buttons to inventory (patch from Zi Ree) 2011-03-27 20:29:04 -07:00
Tofu Linden cb3042d84d merge storm-248 2010-09-29 15:43:34 +01:00