summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-07-28MergeLogan Dethrow
2011-07-25merge fix for SH-2031Oz Linden
2011-07-25close head created by 54e071a92450Oz Linden
2011-07-25merge changes for storm-1458Oz Linden
2011-07-25SH-2031 Fix for bad vertex shader/fragment shader varying usage.Dave Parks
2011-07-24mergeDave Parks
2011-07-24dummy check in to make hg happyDave Parks
2011-07-24mergeDave Parks
2011-07-22merge changes from snowstorm team review buildOz Linden
2011-07-22SH-2031 Disable usage of glMapBuffer (again). Despite using MapBufferRange, ↵Dave Parks
this is still a source of frame stalls.
2011-07-21SH-2031 Don't do network I/O from the main thread in llcurl.Dave Parks
Reviewed by Kelly
2011-07-21mergeLogan Dethrow
2011-07-21SH-2031 Fix for stall in "Cleanup"Dave Parks
2011-07-21merge changes for eli2_viewer-developmentOz Linden
2011-07-21SH-2020 Fix for avatar skin/eyes and trees being bright/black/busted underwater.Dave Parks
2011-07-20SH-2048 Fix for invisiprims infecting neighboring prims with their invisi-ness.Dave Parks
2011-07-20SH-2021 Fix for black water at the horizon from occlusion culling madness.Dave Parks
2011-07-20SH-1838 Add error handling for allocation of off screen render targets.Dave Parks
Reviewed by Leslie
2011-07-20FIX INTL-58 set25, light set4 translation for 6 languageseli
2011-07-19SH-2038 FIX -- [PUBLIC] Severe performance drop on MacBook ProsLeslie Linden
EXP-997 FIX -- Significant FPS degradation in 2.8.0 Beta on Mac equipped ATI video card * Disabled VBO's on mac to avoid stalls in renderer * Placed valid data into the padding between triangles in the vertex buffer to remove uninitialized craziness * Removed invalid rendering checks causing GL errors in debug mode Reviewed by davep
2011-07-19merge changes for storm-1487Oz Linden
2011-07-19merge changes for storm-1221Oz Linden
2011-07-19merge changes for storm-1502Oz Linden
2011-07-19merge changes for storm-1503Oz Linden
2011-07-19merge changes for vwr-26066Oz Linden
2011-07-19mergeLogan Dethrow
2011-07-19STORM-519 FIXED "Delete" is enabled in the context menu for folders which ↵Paul ProductEngine
contain worn items - Disable "Delete" menu item in case selected folder contains non-removable items.
2011-07-19STORM-1487 FIXED Changed the "get more gestures" marketplace URL.Vadim ProductEngine
2011-07-19STORM-1112 Added LLProxy::applyProxySettings() to apply proxy settings to ↵Logan Dethrow
curl handles. Added call to that function everywhere curl handles are created in the viewer.
2011-07-19STORM-1221 FIXED Hard coded dates made localizable under Group Profile ↵Seth ProductEngine
Land/Assets. Added a function for parsing a date string of specific format. Added strings defining the date format in Group Profile Land/Assets that should be localized.
2011-07-18sync with viewer-developmenteli
2011-07-18merge changes for storm-1515Oz Linden
2011-07-18merge changes for storm-1517Oz Linden
2011-07-18merge changes for storm-1516Oz Linden
2011-07-18sync with viewer-developmenteli
2011-07-18SH-2031 Fix for shadow render targets using inappropriate shader for ↵Dave Parks
occlusion culling resulting in objects popping in and out of the shadow map.
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18SH-2031 Fix for link error in llui_libtestDave Parks
2011-07-18re-enable the watchdogOz Linden
2011-07-17SH-2031 High risk changeset, but potentially high reward. Addresses frame ↵Dave Parks
stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-07-16merge changes for storm-1482Oz Linden
2011-07-16merge late release changes and tagsOz Linden
2011-07-16pull back late beta fixOz Linden
2011-07-16Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15After review and testing, realized that 'WatchdogEnabled' is actually true ↵jenn
to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value. Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.
2011-07-15Merge for STORM-1482Aaron Stone
2011-07-15STORM-1482 Always run the crash loggers, they will check what to do and how ↵Aaron Stone
to clean up.
2011-07-15storm-1510: update to new login display urlOz Linden
2011-07-15STORM-1506 FIXED Reset the estate to global sun when changing region ↵Vadim ProductEngine
environment settings. By the way, moved estate info storage from the REGION/ESTATE floater to a model class.