summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-02-10SH-2963 Fix for highlight transparent not highlighting 100% transparent objects.Dave Parks
2012-02-06SH-2794, resolved merge conflict and corrected logic in ↵Leslie Linden
LLVertexBuffer::determineUsage() to work the way it used to.
2012-02-06merge, conflicts in llvertexbuffer.{h,cpp}Brad Payne (Vir 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-31Fixed up LLVolume memory leak caused by mesh repo thread.Leslie Linden
Reviewed by Bao.
2012-01-31SH-2592 FIX -- (OS X Lion) Graphics issues with Atmospheric Shaders enabled ↵Leslie Linden
on Intel HD 3000, 10.7.2 This is a dummy check-in to get the previous commit associated with SH-2592 instead of EXP-2592, which was a typo.
2012-01-30EXP-2592 FIX -- (OS X Lion) Graphics issues with Atmospheric Shaders enabled ↵Leslie Linden
on Intel HD 3000, 10.7.2 * Fixed up shaders to add haze_density and blue_density together correctly as vec4's rather than relying on the shader compiler to add them together properly.
2012-01-30Merge with latestLeslie Linden
2012-01-30SH-2592 PROGRESS -- (OS X Lion) Graphics issues with Atmospheric Shaders ↵Leslie Linden
enabled on Intel HD 3000, 10.7.2 Refactored WindLight estate settings to use float uniforms in the shaders that only need it, rather than vec4's for everything.
2012-01-30increment viewer version to 3.2.9Oz Linden
2012-01-30merge changes for vmrg-219Oz Linden
2012-01-30mergeBrad Payne (Vir Linden)
2012-01-27mergeDave Parks
2012-01-27SH-2646 Fix for shiny HUD objects not being fullbrightDave Parks
2012-01-27mergeBrad Payne (Vir Linden)
2012-01-27SH-2684 FIX, SH-2716 FIX - bug was specific to running in non-english languageBrad Payne (Vir Linden)
2012-01-27SH-2768 Put transparency checkerboard back in texture previewDave Parks
2012-01-26Fix for windows buildDave Parks
2012-01-26* Fixed up shader compilation errors to get lighting and shadows working ↵Leslie Linden
again on Mac. * Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools. * Added new shader feature for atmospheric helpers in the absence of lighting. Reviewed by davep.
2012-01-26* Removed old, unused RenderNightBrightness from feature table.Leslie Linden
Reviewed by davep.
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-25SH-2565 Move resetVertexBuffer operation to a consistent location (also ↵Dave Parks
avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer.
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-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-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.