summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-28Pull merge from lindenlab/viewer-releaseMerov Linden
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-17Pull merge from oz_linden/336-snowstormMerov Linden
2013-10-16Pull merge from lindenlab/viewer-releaseMerov 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-09temporarily added test call for FlickrConnect and TwitterConnect for ACME-1014Cho
2013-10-04Pull merge from viewer-fbcMerov Linden
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-26MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for ↵Graham Madarasz (Graham Linden)
SLURL handling
2013-09-26ACME-946 : Do not force set the focus on the web element, that messes things ↵Merov Linden
up badly...
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-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
2013-09-23made change to include channel name in the settings_install.xml file ↵JJ Linden
generated. changed so that sourceid is not part of a list of options pulled into that file, along with the channel
2013-09-23MAINT-3159 FIXED Disable buttons when refreshing ui.Mnikolenko ProductEngine
2013-09-20MergeGraham Linden
2013-09-20MAINT-3172 fix rendering regressions from release mergedownGraham Linden
2013-09-20Fix AvatarRenderInfo cap broken in merge, add a new diagnostic log messagesimon
2013-09-20ACME-902: Link the '?' button to the proper viewer-help article or articlesGilbert Gonzales
2013-09-20STORM-1950 more suggestions from TankMasker Finesmith about not including ↵Graham Linden
SandyBridge Intel GPUs in driver nagging and updating the expected GL version for 500 series or better nV to get 327.23 driver nagging
2013-09-20NORSPEC-366 fix regression on 10.6.8 Mac only from release to bear mergeGraham Linden
2013-09-20NORSPEC-292 fix regression of materials bug from mismerge of release to bearGraham Linden