summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2020-06-03More post-merge cleanupAndrey Lihatskiy
2020-06-03Post-merge buildfixAndrey Lihatskiy
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-06-02Increment viewer version to 6.4.4Nat Goodspeed
following promotion of DRTVWR-508
2020-05-28SL-13329 Misalligned checkboxes in inventory filtersAndrey Kleshchev
2020-05-28SL-12607 Bar color to blueAndrey Kleshchev
2020-05-28SL-13340 Restored status display for loginAndrey Kleshchev
2020-05-28SL-12665 Readjusted all logosAndrey Kleshchev
2020-05-28SL-12664 readjusted logo #2Andrey Kleshchev
2020-05-28SL-12664 readjusted logoAndrey Kleshchev
2020-05-28SL-12607 Reverted to original logosAndrey Kleshchev
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-19SL-13273 Updated the SL logo imagesAndrey Lihatskiy
2020-05-19SL-12896 BOM texture settings - replaced isRiggedMesh() call with faster checkAndrey Lihatskiy
2020-05-19SL-12904 Restored the missing code (post-merge)Andrey Lihatskiy
2020-05-18Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp
2020-05-18Merged master into DRTVWR-508Andrey Kleshchev
2020-05-18Increment viewer version to 6.4.3Nat Goodspeed
following promotion of DRTVWR-460
2020-05-15SL-12237 Remade updates for invisible avatarsAndrey Kleshchev
2020-05-14Merged in SL-12090 (pull request #105)Andrey Lihatskiy
SL-12090 Initialize the joystick only when required * SL-12090 Initialize the joystick only when required Approved-by: Andrey Kleshchev
2020-05-08SL-12396 FIXED Last line can't be removed if it was selected via triple-clickingMnikolenko Productengine
2020-05-07SL-12970 Fixed char length crashAndrey Kleshchev
2020-05-06DRTVWR-510 cache vulkan-detect resultDave Houlton
2020-05-06DRTVWR-510 add code to report Vulkan capability in stats (Windows-only)Dave Houlton
2020-05-05SL-13178 Improve initial opening time of the landmarks floaterMnikolenko Productengine
2020-05-05SL-12527 cursor is not changed to the pointer on the MoTD link when teleportingAndrey Kleshchev
2020-05-05BuildfixAndrey Lihatskiy
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-04Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-05-04Merged master into DRTVWR-508Andrey Kleshchev
2020-05-04Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-05-04Increment viewer version to 6.4.2Nat Goodspeed
following promotion of DRTVWR-500
2020-05-01SL-12678 Removed auto login retryAndrey Kleshchev
2020-05-01SL-12896 - BOM texture settingsBrad Payne (Vir Linden)
2020-04-30SL-12898 Added https to allowed audio linksAndrey Kleshchev
2020-04-30SL-13141 Crashfix contributionAndrey Kleshchev
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-04-28SL-13133 Numerical camera preset names sorting order fixAndrey Lihatskiy
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-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-20Merged master into DRTVWR-508Andrey Kleshchev
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-16SL-12607 Removed spacerAndrey Kleshchev
2020-04-15SL-12607 Rearrange login panelAndrey Kleshchev