summaryrefslogtreecommitdiff
path: root/doc
AgeCommit message (Collapse)Author
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-07SL-15234 Fix for linux build of 3p-uriparser by NickyDAndrey Kleshchev
Linux specific contibution. Should not affect win and darwin. Doesn't include linux build, just an update to ensure changes gets pulled into uriparser's master when viewer gets promoted and to make sure nothing complains about issues with 'head revision'.
2021-05-06Merge branch master (DRTVWR-515) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
2021-04-30Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-04-30Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml
2021-04-16SL-15096: Merge SovereignEngineer's fix for SL-14035 regressionPtolemy
2021-04-16SL-13395 Allow creating outfit folders under My OutfitsAndrey Kleshchev
2021-04-06SL-14717 Ability to trigger left clicks (and more) on animesh objectsAndrey Lihatskiy
Contribution by Rohacan Hirons SL-14717 Follow ups SL-14717 Using the cached setting in LLToolPie::handleHover()
2021-03-18SL-14927 Some avatar names not resolvingAndrey Kleshchev
2021-03-09Revert "SL-14939 Fixed the log spam"Andrey Lihatskiy
This reverts commit b1ab29eeb6a2475395f92d26a3f07fdb304561f7.
2021-03-09Revert "SL-14940 Fixed ignoring custom cache path"Andrey Lihatskiy
This reverts commit 88746478583711951d04a3ea709ccf1667ddf535.
2021-03-04SL-14940 Fixed ignoring custom cache pathMnikolenko Productengine
2021-03-04SL-14939 Fixed the log spamMnikolenko Productengine
2021-03-04SL-14941 FIXED Cannot upload large images on the Simplified Cache Viewer.Mnikolenko Productengine
2021-03-03SL-14940 Fixed ignoring custom cache pathAndrey Lihatskiy
fix by Ansariel (https://vcs.firestormviewer.org/phoenix-firestorm/changeset/dace23b988af90a65ef57b0b9f540fc48d439dc3)
2021-03-03SL-14939 Fixed the log spamAndrey Lihatskiy
fix by Ansariel (https://vcs.firestormviewer.org/phoenix-firestorm/changeset/5f927b52fdfeebb5db595c7c60c711cee383820b)
2021-02-01Merged in SL-14706 (pull request #457)Michael Pohoreski
SL-14706 Merge Sovereign Engineer's fix for stars not centered around camera: Stars render around center of sim instead of center of camera. Approved-by: Dave Houlton
2021-01-29SL-14706 Merge Sovereign Engineer's fix for stars not centered around ↵Ptolemy
camera: Stars render around center of sim instead of center of camera.
2021-01-29SL-14732: Merge Sovereign Engineer's cloud patch: Fix writing outside ↵Ptolemy
outside of the bound fbo in forward render class2 cloud shader
2021-01-29SL-14731: Fix sun gamma -- merge Sovereign Engineer's patch: Fix sun gamma ↵Ptolemy
space for accurate color reproduction of sun textures
2021-01-26SL-14766 long unicode display names corrupt the conversation.logAndrey Kleshchev
Contribution by Beq Janus
2021-01-25SL-14705: Fix merge conflictPtolemy
2021-01-22SL-14707: Merge Sovereign Engineer's fix for clouds: Clouds are unusually ↵Ptolemy
dim in EEP
2021-01-22SL-3136 Logout crash fixes from Ansariel HillerAndrey Kleshchev
2021-01-06SL-11300 Camera distance to avatar in neighbouring region incorrectAndrey Kleshchev
2021-01-04SL-14491 llDialog spacing inconsistent between string and buttonsAndrey Kleshchev
2020-12-14SL-11300 Camera distance to avatar in neighbouring region incorrectAndrey Kleshchev
2020-12-11SL-14518 Trivial changes to settings.xmlAndrey Kleshchev
Contribution, move comments to their own lines to simplify parsing
2020-11-11Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
2020-11-11Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llpanelavatar.cpp
2020-10-26SL-13560 Water reflections do not reflect everything when ALM is enabledAndrey Kleshchev
Contribution
2020-10-14Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatermodelpreview.cpp
2020-09-23Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-09-21SL-13697 Items I am wearing continue to go to lost and foundAndrey Kleshchev
Contribution from Ansariel Hiller
2020-08-25SL-13858 FIXED Group chat transcripts named with double (group) (group).txt ↵Mnikolenko Productengine
after opening chat history.
2020-08-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-12SL-13583 Some behavior tweaks #1Andrey Kleshchev
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-07-22SL-13642 Updated contributions.txtAndrey Lihatskiy