summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-09increment viewer version to 3.2.7Oz Linden
2012-01-09Added tag 3.2.6-start for changeset 2174ed1c7129Oz Linden
2012-01-09remove incorrect tagOz Linden
2012-01-09Backed out changeset 4fd359f2f1c3Oz Linden
2012-01-09increment viewer version to 3.2.7Oz Linden
2012-01-09Added tag 3.6.0-start for changeset a1012611a195Oz 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-06merge changes for vmrg-211Oz Linden
2012-01-06pull back tags from beta and release branchesOz 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-05Merge with viewer-experienceLeslie Linden
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-05mergeDebi King (Dessie)
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-05Latest from viewer-experienceLeslie Linden
2012-01-04Modified CRASH assert to not occur in release mode per RichardLeslie 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-04reconciled .hgtagsDebi King (Dessie)
2012-01-04Added tag DRTVWR-107_3.2.5-beta2, 3.2.5-beta2 for changeset 65a2c1c8d855Debi King (Dessie)
2012-01-04Added tag DRTVWR-106_3.2.5-beta1, 3.2.5-beta1 for changeset 3d2d5d244c63Debi King (Dessie)
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-04fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and ↵Xiaohong Bao
LLBufferArray::copyIntoBuffers reviewed by vir
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
2012-01-04merge changes for storm-1708Oz Linden
2012-01-04merge changes for latest viewer-developmentOz Linden
2012-01-04EXP-1586 ADDITIONAL FIX (Nearby chat window no longer persists between ↵Paul ProductEngine
viewer startups) - Got rid of confusing conditions.
2012-01-03EXP-1512 FIX changing UI size changes cursor position in notecardsRichard Linden
fixed case where adding text between 2 consecutive newlines created gibberish
2012-01-03Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2012-01-03use lazy deletion of views via die() method to avoid some potential crashesRichard Linden