summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-01-17Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/Richard Linden
2012-01-17merge with viewer-developmentRichard Linden
2012-01-17Latest from viewer-ddLeslie Linden
2012-01-17EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in ↵Leslie Linden
Inventory * Updated context menu code to enable visible items that aren't explicitly disabled.
2012-01-17Merge with viewer-dd, attempt #1Leslie Linden
2012-01-17mergeBrad Payne (Vir Linden)
2012-01-17EXP-1803 CLEAN-UP -- Modified code to use the "unique" tag on the notification.Leslie Linden
2012-01-17EXP-1772 : Suppress a useless and confusing assert in destructor, called ↵Merov Linden
cleanup in there instead.
2012-01-17Pull from viewer-experienceMerov Linden
2012-01-17increment viewer version to 3.2.8Oz Linden
2012-01-17EXP-1758 : Fix crash on login on Mac (bad pointer reference). Might need ↵Merov Linden
more work if the intent was to always get that pointer.
2012-01-17merge changes for vmrg-216Oz Linden
2012-01-17EXP-1768 FIXED (incomplete sentence for translation)Paul ProductEngine
The whole sentence was split to two parts: First pars was in panel.string and the second one in the text box. I combined them both in "allow_label5" text box and also I deleted unnecessary panel.string with the first part of the sentence.
2012-01-16Fix Mac build issueMerov Linden
2012-01-16EXP-1758 WIP Progress spinner not shown during merketplace synch if Merchant ↵Richard Linden
Outbox floater was previously minimized rewrote layout_stack resizing logic to be symmetrical
2012-01-16STORM-1799 Object doesn't appear in Block list if trying to block from ↵Jonathan Yap
Remote object inspector
2012-01-15STORM-1796 Preferences->Privacy->Only friends and groups can call or IM me ↵Jonathan Yap
cannot be changed unless Voice Chat is enabled
2012-01-13EXP-1770 WIP Drag and drop visual selection can be off across hierarchiesRichard Linden
added throttling to fetchInventoryItem queries
2012-01-13Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2012-01-13EXP-1770 WIP Drag and drop visual selection can be off across hierarchiesRichard Linden
made shift-selection work consistently across folder boundaries
2012-01-13EXP-1803 FIX -- Notify the user when a folder is automatically created for ↵Leslie Linden
them in the outbox * New confirmation dialog lets them know when a folder was automatically created to contain an item dragged/copied to the outbox.
2012-01-13EXP-1802 FIX -- Create labeled drop target region at bottom of merchant ↵Leslie Linden
outbox floater for easy top level drop access * Added generic drop zone that highlights green when its functionality will be used.
2012-01-13Pull from viewer-experiencemerov
2012-01-13EXP-1775 : cleanup a bit PeekMessage() usage, avoid eating one event when ↵merov
reaching MAX_MESSAGE_PER_UPDATE.
2012-01-13Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-mergeRichard Linden
2012-01-13merge changes for vmrg-215Oz Linden
2012-01-13merge changes for vmrg-214Oz Linden
2012-01-12trivial: fix a mac build error.Xiaohong Bao
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-12fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory ↵Xiaohong Bao
crashes.
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-12STORM-1798 'Block' menuitem title isn't changed after blocking item in ↵Jonathan Yap
object inspector
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-11Pull from viewer-experienceMerov Linden
2012-01-11EXP-1549 : Disable the Remove button menu item in the toolbar contextual ↵Merov Linden
menu if no button clicked
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-11Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2012-01-11assert for updating views while drawing was too aggressiveRichard Linden
made assert match actual error condition for list iterators reviewed by Leslie
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