summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Expand)Author
2013-12-02merge with releaseRichard Linden
2013-11-26merge changes for storm-1984Oz Linden
2013-11-26remove excessively complex fixes for MAINT-2914 and MAINT-3142Oz Linden
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-25Merge - doh!simon
2013-11-21Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-19MAINT-2287 : Fix merge errors when merging viewer-releaseMerov Linden
2013-11-19SH-4606 FIX: Interesting: Small objects do not load until they are very close.Richard Linden
2013-11-19merge up to 3.6.10-release; some of the storm-68 changes lostOz Linden
2013-11-19STORM-1980 Merge changes Oz made (new way of detecting an agent has changed r...Jonathan Yap
2013-11-18Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-18merge changes for STORM-1831Oz Linden
2013-11-13moved SceneLoadingMonitor settings vars (and renamed SceneLoadingPixelDiffThr...Richard Linden
2013-11-12replaced Flickr and Twitter FUI icons for ACME-1181Cho
2013-11-12Merge downstream code from viewer-bearsimon
2013-11-12Merge. Refresh from viewer-release after 3.6.10 releaseMonty Brandenberg
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated fieldsRichard Linden
2013-11-12added Flickr and Twitter FUI buttons for ACME-1179Cho
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-11fix for SH-4607: Create new object cache tuning parametersXiaohong Bao
2013-11-11merge changes for 3.6.10-releaseOz Linden
2013-11-11merge 3.6.10-releaseOz Linden
2013-11-07DRTVWR-338 Make an inocuous change to get a new build number out of TeamCityDave Parks
2013-11-06final settings tweaksRichard Linden
2013-11-06merge with releaseRichard Linden
2013-11-06STORM-1980/1983 Add debug setting UISndRestart and value. This UUID will nee...Jonathan Yap
2013-11-06Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-11-06remove some unused debug settings.Xiaohong Bao
2013-11-06increase the default value of "ObjectProjectionAreaCutOff" to be 16 pixels.Xiaohong Bao
2013-11-06re-organize the code of processing the debug setting "ObjectProjectionAreaCut...Xiaohong Bao
2013-11-05fixed focus issue on inventoryRichard Linden
2013-11-05STORM-=1982 Remove duplicate entry in settings.xmlJonathan Yap
2013-10-29Merge viewer-release => sunshine-internalDon Kjer
2013-10-25Fix release merge issues (included upstream changes not yet in release from b...Graham Linden
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-24SH-4577 WIP Interesting: viewer crashed when clicking a offline Conversation ...Richard Linden
2013-10-21STROM-1831 Updating keywords default file. Adding several new constants, func...Ima Mechanique
2013-10-17fix for SH-4569: Objects are not culled by size in the distanceXiaohong Bao
2013-10-17BUG-4185 : Fix glsl compilation error on MacMerov Linden
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-15Renaming file to better reflect it's actual usage for the future.Ima Mechanique
2013-10-14Pull merge with lindenlab/viewer-bearMerov Linden
2013-10-14Pull merge from lindenlab/viewer-releaseMerov Linden
2013-10-10Quite down log spam from loading shaders.Dave Parks
2013-10-09Enable the debug setting "NonvisibleObjectsInMemoryTime"Xiaohong Bao
2013-10-08merge from viewer-releaseRichard Linden