summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-02-06merge changes for storm-1741Oz Linden
2012-02-06increment viewer version to 3.3.0Oz Linden
2012-02-03merge changes for vmrg-222Oz Linden
2012-02-03EXP-1868 FIX Remove Merchant Outbox from Me menuRichard Linden
removed merchant outbox context menu reviewed by Leslie
2012-02-03EXP-1868 FIX Remove Merchant Outbox from Me menuRichard Linden
reviewed by Leslie
2012-02-03EXP-1843 WIP Added an option to output avatar rez timing.Vadim ProductEngine
Use the new "Avatar Rez" debugging tag to see the output.
2012-02-01mergeBrad Payne (Vir Linden)
2012-01-31STORM-1741 Collection of color and skinning issuesHitomi Tiponi
With help from Jonathan Yap
2012-01-30increment viewer version to 3.2.9Oz Linden
2012-01-30merge changes for vmrg-219Oz Linden
2012-01-25Introduce two new parameters "CurlUseMultipleThreads" and ↵Xiaohong Bao
"CurlRequestTimeOut" for QA to test Curl.
2012-01-25Automated merge with https://bitbucket.org/VirLinden/vir-project-3Xiaohong Bao
2012-01-25fix for SH-2904: textures remain stuck in HTP stateXiaohong Bao
2012-01-24SH-2791 Use request class constructor/destructor for keeping track of ↵Dave Parks
concurrent requests instead of unreliable increments/decrements sprinkled around the code.
2012-01-30mergeBrad Payne (Vir Linden)
2012-01-24merge changes for vmrg-218Oz Linden
2012-01-24mergeDave Parks
2012-01-24SH-1427 Fix for spot lights not working properly on alpha objects, and fix ↵Dave Parks
for alpha lighting of point lights not matching deferred lights.
2012-01-24mergeBrad Payne (Vir Linden)
2012-01-23Reverting background fetch on an item to the old fetFromServer call to fix ↵Leslie Linden
regression bug in inventory late loading
2012-01-23Reverting rev 22217 changes to background fetch so search and recent will ↵Leslie Linden
fully fetch user inventory
2012-01-23* Optimization to not waste some time doing std::string assignment all over ↵Leslie Linden
the graphics code. Reviewed by davep.
2012-01-23EXP-1799 FIX -- Replace and Add to Outfit options and Copy to Merchant ↵Leslie Linden
Outbox options can appear in invalid state when a valid folder is last selection EXP-1834 FIX -- Right click context menus on Folders in Merchant Outbox and Library folders can show all inventory options including admin options EXP-1835 FIX -- Right clicking on a folder and selecting New Folder creates folder under My Inventory not within selected folder * Updated folder context menu building to build full options in one step or trigger a load which will rebuild top-level context menu for all selected items when complete. Previous code had an implicit assumption that the selected folder was the only selection after background fetch.
2012-01-23merge changes for storm-1799Oz Linden
2012-01-23merge changes for storm-1798Oz Linden
2012-01-23merge changes for storm-1796Oz Linden
2012-01-23merge changes for storm-1788Oz Linden
2012-01-20* Modified so "Copy" context menu option is not available for "no copy" items.Leslie Linden
2012-01-20EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in ↵Leslie Linden
Inventory * Refactored LLFolderBridge::buildContextMenu fetch to clear and rebuild basic context menu options after the fetch rather than trying to merge the two.
2012-01-20Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-20trivial: remove debug code for SH-2828 [crashhunters] Crash in ↵Xiaohong Bao
LLRefCount::unref(), bad stacks
2012-01-20SH-2889 Add visual auto-muting controlsDave Parks
2012-01-20EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in ↵Leslie Linden
Inventory * Modified build context menu code to not disable items that are invisible so secondary background fetch can coalesce menu options with proper state. * Removed "Move to Merchant Outbox" context menu option.
2012-01-20fix for SH-2823 and SH-2824: LLCurl crash inside LLBufferArray::countAfter() ↵Xiaohong Bao
and LLBufferArray::copyIntoBuffers
2012-01-19fixed buildRichard Linden
2012-01-19made layoutPanels have constant user_resize and auto_resize attributesRichard Linden
2012-01-19Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/Richard Linden
2012-01-19EXP-1824 FIX Received Items panel does not collapse correct when Height of ↵Richard Linden
panel is maximized in Inventory window
2012-01-19EXP-1829 FIX -- Selecting a valid item last allows other selected invalid ↵Leslie Linden
items to be copied to Outbox with context menu option * Updated context menu default enabled state to use the last state rather than TRUE. Once per frame, the states are all reset to TRUE so this has the effect of AND'ing together successive buildContextMenu functions rather than ignoring previous states.
2012-01-19EXP-1828 FIX -- Drag and drop to an open folder in the outbox causes it to ↵Leslie Linden
close automatically * Updated auto-open behavior to ignore items that are already open.
2012-01-19* Added member variables to avoid several per-frame getChild calls.Leslie Linden
2012-01-19EXP-1827 FIX -- Drag area in outbox does not always highlight green when ↵Leslie Linden
indicating a top level drop * Updated the outbox drop area highlight to include top level drops within the outbox inventory panel itself.
2012-01-19SH-2794 Fix for bad textures on some hardware when vbo mapping disabled ↵Dave Parks
(always use GL_STREAM_DRAW as the usage hint when mapping is disabled as geometry will be uploaded again and again)
2012-01-19SH-2779 Fix for some transparent rigged attachments not being rendered ↵Dave Parks
correctly.
2012-01-19mergeDave Parks
2012-01-19SH-2885 Add mesh requests pending/processing line to "Show Render Info"Dave Parks
2012-01-18Fix a Linux compilation failureMerov Linden
2012-01-18Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-18fix for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()Xiaohong Bao
2012-01-18Merge with latestLeslie Linden