summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2014-04-22Merge with 3.7.6-releasedolphin
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10Mergedolphin
2014-02-26Merge with 3.7.2-releasedolphin
2014-02-25Merge viewer-releasesimon
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-12Merge with 3.7.0dolphin
2014-02-11Merge. Refresh from viewer-release after 3.7.0 releaseMonty Brandenberg
2014-02-10Merge viewer-releasesimon
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-07merge changes for Snowstorm fall contributionsOz Linden
2014-01-07merge changes for storm-1980Oz Linden
2014-01-03merge changes for 3.6.12-releaseOz Linden
2013-12-18STORM-1980: set new region restart sound uuidOz Linden
2013-12-09Fixed windows line endingsdolphin
2013-12-02Merge with 3.6.11dolphin
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-19STORM-1980 Merge changes Oz made (new way of detecting an agent has changed ↵Jonathan Yap
regions) Modify code to make use of the changed callback
2013-11-18Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-12Merge downstream code from viewer-bearsimon
2013-11-12Merge. Refresh from viewer-release after 3.6.10 releaseMonty Brandenberg
2013-11-11MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated fieldsRichard Linden
moved viewer information strings into LLAppViewer replaced Help>Report a Bug with direct use of Jira link
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-11Merge with 3.6.10dolphin
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-06STORM-1980/1983 Add debug setting UISndRestart and value. This UUID will ↵Jonathan Yap
need to be replaced with an official UUID once one has been established.
2013-11-05STORM-=1982 Remove duplicate entry in settings.xmlJonathan Yap
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-25Merge with 3.6.9dolphin
2013-10-22Merge with viewer-beardolphin
2013-10-17BUG-4185 : Fix glsl compilation error on MacMerov Linden
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-15merge changes for DRTVWR-336Oz Linden
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
Up bone cap to 64 for rigged meshes.
2013-10-04Merge. Pull in viewer-release after 3.6.7 release.Monty Brandenberg
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-10-04Merge with 3.6.7dolphin