summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-13Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-10-16Automated merge with file:///Users/nat/linden/viewer-sourceidNat Goodspeed
2012-10-15Add 'sourceid' settings var specifically for skin-files insertion.Nat Goodspeed
Add logic after (both!) LLTransUtil::parseStrings() calls to ensure that "[sourceid]" embedded in (e.g.) strings.xml content will be replaced.
2012-10-10Remove HelpUseLocal setting variable. Hide local html skin dir.Nat Goodspeed
We assert that the local html directory is no longer used. Remove machinery related to its use, notably HelpUseLocal, the code that checks it and the code that sets and examines special flag URL "__local". Before actually killing off the local skins/default/html directory, make viewer_manifest.py rename it but continue packaging it as html.old. If this doesn't cause a panic, we can proceed with removing it entirely.
2012-09-08DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
cmake and other files didn't get moved over, do it by hand.
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
This was yet another refresh from v-d because of significant changes to lltexturefetch that would not have been resolvable by casual application of any merge tool. There are still a few questions outstanding but this is the initial, optimistic merge.
2012-08-16merge up to latest viewer-developmentOz Linden
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-13Merge from viewer-development.Monty Brandenberg
2012-08-09MAINT-1342: correct initial login location handling, clarify the two related ↵Oz Linden
persistent settings
2012-08-08Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-08-03Merge of viewer-development (3.4.1).Monty Brandenberg
2012-08-02Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-31merge up to latest viewer-developmentOz Linden
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-19SH-3280 Better init/shutdown functionality for llcorehttp by llappviewerMonty Brandenberg
Isolate llcorehttp initialization into a utility class (LLAppCoreHttp) that provides glue between app and library (sets up policies, handles notifications). Introduce 'TextureFetchConcurrency' debug setting to provide some field control when absolutely necessary.
2012-07-16Path-814: Corrected shader fragment compilation error.prep
2012-07-12Removing debug settings that were in place for pathfinding simulator testing.Todd Stinson
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-06-29Fix --skin command-line switch by mapping to the correct var name.Nat Goodspeed
It said it mapped to 'SkinFolder', which doesn't exist. 'SkinCurrent' is correct.
2012-06-28Merge cleanupDave Parks
2012-06-28MergeDave Parks
2012-06-28merge up to 3.3.3-releaseOz Linden
2012-06-26Updating the pathfinding-specific settings with appropriate comments and an ↵Todd Stinson
unified naming scheme.
2012-06-26v-r to drano merge conflicts wipBrad Payne (Vir Linden)
2012-06-26Some clean-up after checking the differences between the pathfinding branch ↵Todd Stinson
and viewer-release.
2012-06-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-06-22MAINT-653 Fix for shadow acne at high altitudesDave Parks
2012-06-22mergeDave Parks
2012-06-21merge changes for DRTVWR-168Oz Linden
2012-06-21merge changes for DRTVWR-171Oz Linden
2012-06-20PATh-762: Adding a debug flag for server testing to always show the rebake ↵Todd Stinson
navmesh button on dirty regions regardless of whether the user has permissions.
2012-06-19merge up to latest viewer-development-havokaiOz Linden
2012-06-18merge to pathfinding development branchOz Linden
2012-06-15MergeDave Parks
2012-06-13MergeGeenz
2012-06-12PATH-735: Limit and clean up grid selectionOz Linden
2012-06-12EXP-1941: Backed out changeset: 2f6546ac7e5eTodd Stinson
2012-06-12for SH-3073: implement a fast cache system for texture fetchingXiaohong Bao
2012-06-11PATH-710: Removing the pathfinding basic floater and supporting class.Todd Stinson
2012-06-08SH-3145 : Expose update fetch and update priorities magic numbers in ↵Merov Linden
settings.xml
2012-06-08merge changes for DRTVWR-163Oz Linden
2012-06-04STORM-1872 A line break is missing in ..\app_settings\settings.xmlJonathan Yap