summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2020-05-19Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-05-18Increment viewer version to 6.4.3Nat Goodspeed
following promotion of DRTVWR-460
2020-05-04Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-05-04Increment viewer version to 6.4.2Nat Goodspeed
following promotion of DRTVWR-500
2020-04-28SL-13133 Numerical camera preset names sorting order fixAndrey Lihatskiy
2020-04-27SL-12678 Removed auto login retryAndrey Kleshchev
2020-04-27SL-12678 Removed auto login retryAndrey Kleshchev
2020-04-26Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
2020-04-23SL-12904 Temporarily use LLSD to avoid crashes on older viewersMnikolenko Productengine
2020-04-21Post-merge build fixAndrey Lihatskiy
2020-04-21Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/de/floater_preview_texture.xml # indra/newview/skins/default/xui/es/floater_preview_texture.xml # indra/newview/skins/default/xui/fr/floater_preview_texture.xml # indra/newview/skins/default/xui/it/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/panel_edit_classified.xml # indra/newview/skins/default/xui/ja/panel_me.xml # indra/newview/skins/default/xui/ru/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/floater_picks.xml # indra/newview/skins/default/xui/tr/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/panel_edit_classified.xml # indra/newview/skins/default/xui/tr/panel_me.xml # indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-21AMD CPUs list updateAndrey Lihatskiy
2020-04-20Restored SL-12732 after merge conflictAndrey Kleshchev
2020-04-20SL-13040 Fixed crash at EnvironmentPersistAcrossLoginAndrey Kleshchev
2020-04-20Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-04-20Increment viewer version to 6.4.1Nat Goodspeed
following promotion of DRTVWR-440
2020-04-20SL-12904 FIXED Camera Preset does not restore correctly when sittingMnikolenko Productengine
2020-04-14SL-13019, fix broken varying linkage on MacOSDave Houlton
2020-04-13SL-12993 Focus on avatar after saving new presetMnikolenko Productengine
2020-04-13SL-13029 Fixed load orderAndrey Kleshchev
2020-04-12SL-13029 Environment update was not applying properlyAndrey Kleshchev
2020-04-10SL-12994 FIXED [Camera Presets] Zoom fraction should be saved as a part of ↵Mnikolenko Productengine
Camera preset, not as separate setting
2020-04-10SL-12999 List can go out of floater's rect, so it should consume scroll eventsAndrey Kleshchev
2020-04-10SL-12999 Removed unused variablesAndrey Kleshchev
2020-04-09SL-12975, unfix alpha and undo non-fix magic number of refracted portion of ↵Dave Houlton
water Fresnel
2020-04-09SL-12999 Some menus allow mouse scroll to zoom cameraAndrey Kleshchev
2020-04-07SL-10449: Put first shader error on new line for readabilityPtolemy
2020-04-07SL-10449: Add dumping of shader to log filePtolemy
2020-04-07SL-10449, add missing linkage variable, fix OSX & Intel deferred shaders compDave Houlton
2020-04-07SL-10449 Cleanup dumping shader without LOG spam on every line when it fails ↵Ptolemy
to compile/link
2020-04-07SL-10449 Fix off-by-one line numbers when dumping shader that failed to ↵Ptolemy
compile/link
2020-04-07SL-10449 Fix ALM on OSXPtolemy
2020-04-07SL-12991 [Camera Presets] Sort all Camera preset lists in the same wayMnikolenko Productengine
2020-04-07SL-12991 [Camera Presets] Sort all Camera preset lists in the same wayMnikolenko Productengine
2020-04-06SL-10993 Fixed Korean font on OSX CatalinaAndrey Lihatskiy
2020-04-06SL-12904 FIXED Camera Preset does not restore correctly when sittingMnikolenko Productengine
2020-04-03SL-11368, fix missing water uniforms for low shader settingsDave Houlton
2020-04-03SL-12852 Cleanup for readabilityPtolemy
2020-04-02SL-12927 FIXED [Camera Presets] when sitting pressing ESC key causes rotationMnikolenko Productengine
2020-04-01Merged in eep-fix-falloff-edit (pull request #54)Rye Mutt
Fix light falloff being corrupted when editing value via build floater spinner Approved-by: Dave Houlton
2020-04-01Merged in eep-fix-light-color (pull request #53)Rye Mutt
Fix editing light color corrupting intensity and color values Approved-by: Dave Houlton
2020-03-30Update falloff fix with changes requested in review.Rye Mutt
2020-03-30SL-12888 Fix space alpha megaprim not using z-testPtolemy
2020-03-30Fix light falloff being corrupted when editing value via build floater spinnerRye Mutt
2020-03-30Fix editing light color corrupting intensity and color valuesRye Mutt
2020-03-27Merged in davep/DRTVWR-440 (pull request #52)Dave Parks
SL-12902 Better fix for light color values in color swatch not matching light color values inworld.
2020-03-27SL-12902 Better fix for light color values in color swatch not matching ↵Runitai Linden
light color values inworld.
2020-03-27SL-12904 FIXED Camera Preset does not restore correctly when sittingMnikolenko Productengine
2020-03-27DRTVWR-440, quick fix, add return value - needed for Mac buildDave Houlton