summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-21increment viewer version to 3.6.12Oz Linden
2013-11-12Merge. Refresh from viewer-release after 3.6.10 releaseMonty Brandenberg
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-11convert dos line endingsOz Linden
2013-11-11increment viewer version to 3.6.11Oz Linden
2013-11-08MAINT-3412 Fix Intel Iris recognizer to include optional Pro as is reported ↵Graham Linden
with integrated-only graphics on new MBP
2013-11-07DRTVWR-338 Make an inocuous change to get a new build number out of TeamCityDave Parks
2013-11-05MAINT-3376 FIXED Successive llSetTextureAnim calls fail in 3.6.10 (283075) ↵maksymsproductengine
unless a different command (llSleep(0.01), llSay(0,"hello")) is placed between them.: - fix for MAINT-2861 was reverted to resolve this issue;
2013-11-01BUG-4286 add AMD R7/R9 entried to GPU tableGraham Linden
2013-10-28Pull merge from lindenlab/viewer-fbcMerov Linden
2013-10-28ACME-1099 : Fix crash when getting the Facebook cap from a (potentially ↵Merov Linden
null) region
2013-10-28MAINT-3343 FIXED Expand/Collapse message pan only on left click.Mnikolenko ProductEngine
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25MAINT-3356 GPU Table update to support Retina MBP 'Intel Iris OpenGL Engine' ↵Graham Linden
driver id on Mavericks.
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-23increment viewer version to 3.6.10Oz Linden
2013-10-17Merge. Pull in viewer-release after 3.6.8 fixes for AMD graphics.Monty Brandenberg
2013-10-17Pull merge from oz_linden/336-snowstormMerov Linden
2013-10-16Fix merge error in llvoavatarGraham Linden
2013-10-16Merge 3.6.8Graham Linden
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16increment viewer version to 3.6.9oz@lindenlab.com
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-11MAINT-2968 Transplant cleanup.Dave Parks
2013-10-10MAINT-2968 Fix for crash on AMD hardware running current drivers.Dave Parks
2013-10-04Merge. Pull in viewer-release after 3.6.7 release.Monty Brandenberg
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-10-03improve preference label for fly/jumpOz Linden
2013-10-03merge changes for 3.6.7-releaseOz Linden
2013-10-03increment viewer version to 3.6.8Oz Linden
2013-09-30MAINT-3193 FIXED crash with LLControlCache<bool>::LLControlCache: Control ↵MaximB ProductEngine
named RenderAutoMuteLoggingnot found.
2013-09-27Up the transfer timeout of small meshes to 120S. This matchesMonty Brandenberg
the change made for MAINT-2347. Large transfers are still 10 minutes. Add/update to-do list and add some more info to the FAQ in the Readme.
2013-09-26MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for ↵Graham Madarasz (Graham Linden)
SLURL handling
2013-09-26Merge lion to get Mac fixGraham Linden
2013-09-26Last minute suggestions for IvyBridge Intel 2500 and nVidia 400 series ↵Graham Linden
expected GL settings from TankMaster Finesmith
2013-09-26Merge lion for good measureGraham Linden
2013-09-26Merge viewer-bear maint RC changes to get this build closer to the RC it ↵Graham Linden
will follow
2013-09-26Try all you want multichar constant, but you'll never be a string to me! ↵Graham Madarasz (Graham Linden)
(fix mac build errors from 'curious' filepicker literals)
2013-09-26NORSPEC-259 revive fix stomped with materials->bear mergeGraham Linden
2013-09-26NORSPEC-259 revive fix stomped with materials->bear mergeGraham Linden
2013-09-25BUG-3984 fix broken rendering of particles using blend funcsGraham Linden
2013-09-25BUG-3984 fix broken rendering of particles using blend funcsGraham Linden
2013-09-25Fix decl of merged genBBoxes func to match merge implGraham Linden
2013-09-25Merge recent viewer-bear fixes that missed the boatGraham Linden
2013-09-25BUG-3982 add code to subtract the lack of not removing the removal of ↵Graham Linden
backfaces for particles (make particles render double-sided again)
2013-09-24SH-3690 SH-4505 Cleanup pass through code.Monty Brandenberg
Start using DNS cache in legacy LLCurl code. Go to 15 seconds particularly as we're using threaded resolver at this point. Documentation cleanup. Add libcurl status checking and logging for curl_easy_setopt() operations that fail. Shouldn't happen and we'll just continue anyway but there's info in the logs to track these down now. Cleaned up logic around FASTTIMER enable defines used to evaluate pipeline stalls in main thread. Removed long-standing thread race around caps strings and URL construction. Not a significant risk but refactoring the code to get rid of them removed one huge eyesore. It can be made even slicker if desired (see notes).
2013-09-24merge more changes for CHOP-985Oz Linden
2013-09-23NORSPEC-285 fix merge error with attenuation on alpha masquerading as this ↵Graham Linden
norspec from wayback