summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
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-19mergeBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Merge up.Cinder
2014-05-07Code policyCinder
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-05-06Let's get started: some code policy cleanup, reference arguments where we ↵Cinder
can, correct spelling
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 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-10merge changes for 3.7.3-releaseOz Linden
2014-03-03merge changes for 3.7.2-releaseOz Linden
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
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-25Merge downstream codesimon
2014-02-12add two debug settings: "SceneLoadLowMemoryBound" and "SceneLoadHighMemoryBound"Xiaohong Bao
2014-02-12merge with releaseRichard Linden
2014-02-11mergeBrad Payne (Vir Linden)
2014-02-11Merge. Refresh from viewer-release after 3.7.0 releaseMonty Brandenberg
2014-02-10Merge downstream code with viewer-releasesimon
2014-02-10Merge viewer-releasesimon
2014-02-06MAINT-3692 FIXED Bindings are added to keys.xmlMnikolenko ProductEngine
2014-02-03MAINT-2613 FIXED Remove duplicate entry for ↵Mnikolenko ProductEngine
"DisablePrecacheDelayAfterTeleporting"
2014-01-29FITMESH-6: correct bounds checkingOz Linden
2014-01-23FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware ↵Dave Parks
skinning enabled and ALM disabled.
2014-01-23merge changes for 3.6.13-releaseOz Linden
2014-01-15Replacing old keyword default file. This is NOT an LL sanctioned file, but a ↵Ima Mechanique
temporary personally generated one for testing while the canonical file is being prepared.
2014-01-14STORM-1831 Updated XML defaults file. Adding some recently added constants. ↵Ima Mechanique
Changed indenting to a single space. Adding the Relax schema file that is referenced in the XML.
2014-01-11Updated indenting of XML file to use a single tab per indent level. This ↵Ima Mechanique
also reduces the file size by over 200KB
2014-01-07merge changes for Snowstorm fall contributionsOz Linden
2014-01-07merge changes for storm-1980Oz Linden