summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2013-12-12Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-05Renamed floater_social to floater_facebook for ACME-1205Cho
2013-11-12replaced Flickr and Twitter FUI icons for ACME-1181Cho
2013-11-12added Flickr and Twitter FUI buttons for ACME-1179Cho
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-07DRTVWR-338 Make an inocuous change to get a new build number out of TeamCityDave Parks
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-09-25Merge recent viewer-bear fixes that missed the boatGraham Linden
2013-09-20MAINT-3172 fix rendering regressions from release mergedownGraham Linden
2013-09-19Merge downstream codesimon_linden
2013-09-19Pull from lindenlab/viewer-releaseMerov Linden
2013-09-18The unbearable lightness of being norspecGraham Linden
2013-09-17MAINT-3161 : Clean up avatar muting code and prototype featuresimon
2013-09-16MAINT-3107 speculative changes to try to ameliorate rigged crasher on Intel ↵Graham Linden
HD with crappy default driver
2013-09-13MAINT-3133 FIXED Expand Nearby Chat participant list on first open of ↵dmitrykproductengine
Conversations floater, per login session
2013-09-09Merge downstream code with viewer-releasesimon_linden
2013-09-09Pull from lindenlab/viewer-releaseMerov Linden
2013-09-09Merge viewer-release 3.6.5 CocoaGraham Linden
2013-09-09Merge viewer-releasesimon
2013-09-05NORSPEC-360 fix issues with mip selection and TCs in projector fake env ↵Graham Linden
reflection
2013-09-03ACME-789: Remove SLShareHost setting from settings.xmlGilbert Gonzales
2013-08-28merging viewer releaseGilbert Gonzales
2013-08-28MAINT-2506 Fix typo in PERMISSION_SILENT_ESTATE_MANAGEMENT keyword. ↵Maestro Linden
Reviewed by Kelly.
2013-08-27MAINT-3065 : Avatar render info's 'geometry' stat is unpredictable for ↵simon
linked objects Removed "geometry" and "surface" Reviewed by Kelly
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26Merge the CHUIstorm 3.6.5Graham Linden
2013-08-26remove unused --logevents command line option because new validation causes ↵Oz Linden
unmapped options to be errors
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-27Merge downstream codesimon_linden
2013-08-26Merge downstream code for CHUIStormsimon
2013-08-22merging viewer releaseGilbert Gonzales
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-08-20MAINT-3005 FIXED Set max persistent notifications to reduce log-in timemaxim@mnikolenko
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-19Merge in viewer-releaseGraham Linden
2013-08-15NORSPEC-349 make render targets use original formats when resizing impostors ↵Graham Linden
and fix alpha for deferred impostor shader
2013-08-15NORSPEC-352 for non-ALM rendering, make lighting shader with alpha masking ↵Graham Linden
obey vertex alpha
2013-08-15NORSPEC-342 NORSPEC-352 make impostor alpha shader use vertex alpha to ↵Graham Linden
remedy unsightly blemishes, boxes, and the occasional extra wing.
2013-08-15MAINT-3012 FIXED Don't show Destination Guide by default on first run.Mnikolenko ProductEngine
2013-10-23Merge latest viewer-release with FBCsimon
2013-10-17MAINT-3330 fix regression on mac caused by shader change for 3107 by rolling ↵Graham Linden
back to prev version of shader
2013-10-04MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6 (280797)dmitrykproductengine
2013-08-13added read_from_master parameter for ACME-829Cho
2013-08-12NORSPEC-342 tweak shader to work on mac og glslGraham Linden