summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-11-10Merge. Refresh from viewer-release after 3.7.20 released.Monty Brandenberg
2014-11-10merge changes for 3.7.20-releaseOz Linden
2014-11-10increment viewer version to 3.7.21Oz Linden
2014-11-06BUG-7698, BUG-7688, BUG-7694 (others) CDN connection issues.Monty Brandenberg
Under pipelining, requests were given a 5x timeout factor due to the way that the timeout clock works in libcurl. Under CDN load, connections were not being torn down quickly and it was only this timer that led to disconnect and retry. So, we want to break a connection that isn't making progress but that isn't immediately possible. We'll compromise with a 60S timeout that (we hope) will be neither too long for stalled connections nor too short for large asset transfer requests.
2014-11-03Merge downstream code and become 3.7.20simon
2014-11-03mergeBrad Payne (Vir Linden)
2014-11-03Pull in viewer-release and become version 3.7.20simon
2014-11-03SL-93 WIP - pelvis fixup offsetsBrad Payne (Vir Linden)
2014-10-31settings.xml updateBrad Payne (Vir Linden)
2014-10-30SL-93 WIP - missing includeBrad Payne (Vir Linden)
2014-10-30SL-93 - WIP on managing pelvis fixups using new joint offset frameworkBrad Payne (Vir Linden)
2014-10-29merge changes for MAINT-4560Oz Linden
2014-10-28merge changes for 3.7.19-releaseOz Linden
2014-10-28merge changes for 3.7.19-releaseOz Linden
2014-10-28increment viewer version to 3.7.20Oz Linden
2014-10-23merge changes for STORM-2081Oz Linden
2014-10-23STORM-2081 - Guard against null gWindowImplementation when fullscreen ↵Cinder
(crashes OS X Yosemite)
2014-10-21merge changes for 3.7.18-releaseOz Linden
2014-10-21merge changes for 3.7.18-releaseOz Linden
2014-10-20Merge downsteam code and become version 3.7.19simon
2014-10-20Merge downsteam viewer-release and become version 3.7.19simon
2014-10-20Merge. Refresh from viewer-release after 3.7.18 release.Monty Brandenberg
2014-10-20increment viewer version to 3.7.19Oz Linden
2014-10-17SL-93 WIP - refactoring LLPosOverrideMap for reusabilityBrad Payne (Vir Linden)
2014-10-29MAINT-4605 WIP - you can't hide your lion eyesBrad Payne (Vir Linden)
2014-10-29MAINT-4606 WIP - handle removing attachments that contain multiple mesh objectsBrad Payne (Vir Linden)
2014-10-15MAINT-4560: turn on display of group title by defaultOz Linden
2014-10-14STORM-2080: correct fitted mesh rendering on some ATI cardsOz Linden
2014-10-14re-fix STORM-1828 (previous fix lost in merge)Oz Linden
2014-10-14Code style cleanups... mostly fixed indentingOz Linden
2014-10-13merge changes for STORM-2056Oz Linden
2014-10-13merge changes for OPEN-215Oz Linden
2014-10-13merge changes for STORM-2053Oz Linden
2014-10-13merge changes for STORM-2078Oz Linden
2014-10-13merge changes for OPEN-268Oz Linden
2014-10-13merge changes for 3.7.17-releaseOz Linden
2014-10-13merge up to 3.7.18Oz Linden
2014-10-10MAINT-4564 HTTP Pipelining is not happening in Drano HTTP Phase 4Monty Brandenberg
Incorporate the new libcurl 7.38.0 build with curl bug 1420 workaround. Add developer-centric testing code to evaluate the workaround or a future fix for 1420.
2014-10-09Fixed a build issue in llpanellogin.cppmaksymsproductengine
2014-10-09Merge downstream code and become 3.7.18simon
2014-10-09MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploadsMnikolenko ProductEngine
2014-10-09MAINT-2560 FIXED Show name of source avatar above crosshairMnikolenko ProductEngine
2014-10-09MAINT-2565 FIXED Show texture information in one toastMnikolenko ProductEngine
2014-10-09MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploadsMnikolenko ProductEngine
2014-10-08Switched to keying joint offsets by mesh idBrad Payne (Vir Linden)
2014-10-07track avatar size info in avatar debug lineBrad Payne (Vir Linden)
2014-10-07MAINT-4548 & MAINT-4557 FIXED build issuesmaksymsproductengine
2014-10-07Merge 3.7.18maksymsproductengine
2014-10-06Merge. Refresh from viewer-release after 3.7.17 release.Monty Brandenberg
2014-10-06increment viewer version to 3.7.18Oz Linden