summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-01-13merge changes for vmrg-214Oz Linden
2012-01-12EXP-1795 FIX -- Update warning dialog for dragging and dropping no-copy ↵Leslie Linden
items to Merchant Outbox * Any drag and drop or copy operation to the merchant outbox that contains one or more no-copy items now brings up a single modal dialog prompting the user to move the no-copy items to the outbox or to leave them all behind.
2012-01-12Fixing up 'cancel' button text on no-copy item transfer to outbox messageLeslie Linden
2012-01-12Automated merge with https://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-01-12Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/Richard Linden
2012-01-12Merge with latest from viewer-experienceLeslie Linden
2012-01-11EXP-876 : Avoid ui elements using the same name reference.Merov Linden
2012-01-11EXP-1752 FIX -- Merchant outbox import completion success modal dialog needs ↵Leslie Linden
checkbox to disable EXP-1795 PROGRESS -- Update warning dialog for dragging and dropping no-copy items to Merchant Outbox * The text associated with EXP-1795 has been updated but the "apply to all" checkbox has not been implemented yet. * Updated the "0 folders" text to be an empty string instead.
2012-01-11EXP-1511 REFIX Preview image overlays ui elements in Upload image floatercallum
Tweaked offset and missed a corner case
2012-01-11Correcting logic back to way it was, to make sure invalid objects can not be ↵Leslie Linden
copied to the outbox
2012-01-11Merge with latestLeslie Linden
2012-01-11EXP-1778 FIX -- Link to Marketplace Error log in transfer failed viewer ↵Leslie Linden
notification * Added a link to the "imports" log from the "done with errors" notification when sending folders to the marketplace.
2012-01-11EXP-1788 FIX -- Outbox drag and drop restrictions can be bypassed if ↵Leslie Linden
inventory not fully loaded * The "Copy to Outbox" option is now disabled when the item is in the loading state.
2012-01-11EXP-1790 FIX -- Hitting return on item in Merchant Outbox wears the objectLeslie Linden
* Disabled the "openItem" function on outbox items to prevent default behavior when the return button is pressed.
2012-01-11EXP-1791 FIX -- Handle case where initialization with SLM fails in the ↵Leslie Linden
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-11EXP-1791 - Handle case where initialization with SLM fails in the Merchant ↵Leslie Linden
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-10FIX INTL-89 translation in 8 languages for Set29 including new fileseli
2012-01-10Changed merchant outbox visibility to not persist between sessions.Leslie Linden
2012-01-10EXP-1783 FIXED Duplicated/missing IDs in menu_viewer.xmlVadim ProductEngine
2012-01-10EXP-1766 FIXED Disabled updating agent AFK state if the viewer is ↵Seth ProductEngine
disconnected. Possible crash fix.
2012-01-10EXP-1525 FIXED Potential fix for a crash at shutdown: added some error ↵Vadim ProductEngine
handling to saving inventory cache.
2012-01-09EXP-1511 FIX Preview image overlays ui elements in Upload image floatercallum
2012-01-09EXP-1159 FIX -- User can get No transfer items into Merchant Outbox by ↵Leslie Linden
rezzing object from Outbox, including No Transfer item in contents, and then taking back into Inventory * Drag and drop to the 3D world is now disabled from the outbox
2012-01-09sync with viewer-developmenteli
2012-01-09Merge from viewer-developmentLeslie Linden
2012-01-08merge changes for vmrg-213Oz Linden
2012-01-06Updated InventoryOutboxMaxFolderCount to 21 to allow top level folder and 20 ↵Leslie Linden
subfolders in outbox items
2012-01-06sync with viewer-developmenteli
2012-01-06EXP-1220 GROUNDWORK -- Create context menu entry to allow import of selected ↵Leslie Linden
item(s) * Added a context menu for "Send to Marketplace" but disabled the code to show it until we decide to move forward with this feature. * Made some progress unifying the context menu in the outbox for different types of items. (mesh, audio, etc.)
2012-01-06Looking for better fix to EXP-1693 - date localizationRichard Linden
Backed out changeset: 4f3024e9d629
2012-01-06looking for better fix to EXP-1695Richard Linden
[I18N] [INCORRECT CURRENCY LAYOUT/FORMAT] - Currency in Group Profile > Land/Asset and New Group (French viewer) Backed out changeset: c01a6186b15c
2012-01-06merge changes for vmrg-212Oz Linden
2012-01-06Add capability-based create folder routine for more reliable inventory, with ↵Aura Linden
fix for copy and wear
2012-01-05EXP-1757 FIX -- Merchant Outbox shows as empty when first ↵Leslie Linden
opening/initializing even when populated * Updated merchant outbox floater to not wait for initialization to complete before displaying outbox inventory contents.
2012-01-05EXP-1754 FIX -- Search text shown in Outbox floater after marketplace synch ↵Leslie Linden
if all items removed. * Added a setting to determine whether or not to display the standard empty inventory message. The message is on by default but turned off for the merchant outbox inventory panel.
2012-01-05EXP-1753 FIX -- Open Merchant Outbox floater when user selects copy to ↵Leslie Linden
Merchant Outbox context menu option in Inventory * Modified "copy to merchant outbox" and "move to merchant outbox" context menu actions to also open the merchant outbox floater * Changed context menu behavior to always preserve disabled menu items on multiselect rather than occasionally ignoring it
2012-01-05Automated merge with https://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-01-05Removed unused code for old outbox error reportingLeslie Linden
2012-01-04Merge from viewer-experienceLeslie Linden
2012-01-04EXP-1769 FIX -- Crash in ASSERT (mInDraw == false) - can trigger with ↵Leslie Linden
selecting build tool * Fixed build window to not fail assert at construction time.
2012-01-04Merge from viewer-developmentLeslie Linden
2012-01-04Merge from viewer-experienceLeslie Linden
2012-01-04EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would ↵Leslie Linden
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-04Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-04merge changes for storm-1790Oz Linden
2012-01-04merge changes for storm-1708Oz Linden
2012-01-04Changes per Oz's suggestion on RB.Ima Mechanique
2012-01-04merge changes for storm-1727Oz Linden
2012-01-04mergeBrad Payne (Vir Linden)
2012-01-04merge changes for storm-1725Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 19:43:01 +0000