summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2014-07-25Changed: Snapshot floater layout.NiranV
Changed: Snapshots to disk default to 'Custom' (Window Resolution) Added: Big Auto-scaling integrated image Preview. Can be toggled. Added: Fixed german translations for the new floater layout. Removed: Need to have SnapshotFiltersEnabled to see the filter dropdown. Removed: SnapshotFiltersEnabled debug.
2014-07-07Merge viewer-release and become version 3.7.12simon
2014-07-07MAINT-2980 Back out most changes related to upping the 512MB texture cap to ↵Dave Parks
unblock RC.
2014-06-24Merge viewer-release and become version 3.7.11simon
2014-06-23MAINT-2980 Up texture memory slider cap to 4096MB. Make "Texture Memory" ↵Dave Parks
default to 1/3rd of video memory. Add description on debug setting and tooltip to explain why.
2014-06-23merge changes for 3.7.10-releaseOz Linden
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-17Merge viewer-release and become version 3.7.9simon
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-07Merge upstreamCinder
2014-06-05MergeRicky Curtice
2014-06-04make "default" a constant, and remove that and "state" from eventsOz Linden
2014-05-28Make default and state out of flow-control and into eventsCinder
2014-05-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Merge up.Cinder
2014-05-07Code policyCinder
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-05-06Let's get started: some code policy cleanup, reference arguments where we ↵Cinder
can, correct spelling
2014-04-22Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-22MergeXiaohong Bao
2014-04-22merge up to 3.7.6-releaseOz Linden
2014-04-22mergeBrad Payne (Vir Linden)
2014-04-21merge changes for 3.7.6-releaseOz Linden
2014-04-21Merge downstream codesimon
2014-04-21Merge downstream code updating version to 3.7.7simon
2014-03-24MAINT-3211 Fix for texture animations not working properly on rigged ↵Dave Parks
attachments when worn from inventory.
2014-03-18merge changes for STORM-2020Oz Linden
2014-03-17Restore use of RenderSpecularExponentOz Linden
2014-03-14merge changes for 3.7.3-releaseOz Linden
2014-03-12mergeBrad Payne (Vir Linden)
2014-03-12merge with releaseRichard Linden
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10merge changes for 3.7.3-releaseOz Linden
2014-03-03merge changes for 3.7.2-releaseOz Linden
2014-02-28Automated merge with https://bitbucket.org/lindenlab/viewer-lionDave Parks
2014-02-28MAINT-2613 Two entries for 'DisablePrecacheDelayAfterTeleporting' in ↵Mnikolenko ProductEngine
settings.xml
2014-02-27Automated merge with https://bitbucket.org/lindenlab/viewer-lionDave Parks
2014-02-25Merge downstream codesimon
2014-02-25Merge viewer-releasesimon
2014-02-25keywords_lsl_default.xml updates from the simulator treeOz Linden
2014-02-25merge changes for 3.7.2-releaseOz Linden
2014-02-25merge latest changes from Ima with 3.6.14-releaseOz Linden
2014-02-25merge viewer-release to sunshine-externalBrad Payne (Vir Linden)
2014-02-24merge with releaseRichard Linden