Age | Commit message (Collapse) | Author | |
---|---|---|---|
2021-06-07 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
2021-06-07 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2021-05-07 | SL-15234 Fix for linux build of 3p-uriparser by NickyD | Andrey 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-06 | Merge branch master (DRTVWR-515) into DRTVWR-483 | Andrey Kleshchev | |
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llpanelpicks.cpp (was replaced with a tab in floater) | |||
2021-04-30 | Merge branch 'master' into DRTVWR-527-maint | Andrey Lihatskiy | |
2021-04-30 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-04-30 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-04-29 | Clean up a merge conflict | Callum Prentice | |
2021-04-29 | Merge master (DRTVWR-515) into DRTVWR-516-maint | Andrey 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-29 | Merge master into DV525-merge-6.4.19 | Dave Houlton | |
2021-04-29 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml | |||
2021-04-16 | SL-15096: Merge SovereignEngineer's fix for SL-14035 regression | Ptolemy | |
2021-04-16 | SL-13395 Allow creating outfit folders under My Outfits | Andrey Kleshchev | |
2021-04-06 | SL-14717 Ability to trigger left clicks (and more) on animesh objects | Andrey Lihatskiy | |
Contribution by Rohacan Hirons SL-14717 Follow ups SL-14717 Using the cached setting in LLToolPie::handleHover() | |||
2021-03-18 | SL-14927 Some avatar names not resolving | Andrey Kleshchev | |
2021-03-09 | Revert "SL-14939 Fixed the log spam" | Andrey Lihatskiy | |
This reverts commit b1ab29eeb6a2475395f92d26a3f07fdb304561f7. | |||
2021-03-09 | Revert "SL-14940 Fixed ignoring custom cache path" | Andrey Lihatskiy | |
This reverts commit 88746478583711951d04a3ea709ccf1667ddf535. | |||
2021-03-04 | SL-14940 Fixed ignoring custom cache path | Mnikolenko Productengine | |
2021-03-04 | SL-14939 Fixed the log spam | Mnikolenko Productengine | |
2021-03-04 | SL-14941 FIXED Cannot upload large images on the Simplified Cache Viewer. | Mnikolenko Productengine | |
2021-03-03 | SL-14940 Fixed ignoring custom cache path | Andrey Lihatskiy | |
fix by Ansariel (https://vcs.firestormviewer.org/phoenix-firestorm/changeset/dace23b988af90a65ef57b0b9f540fc48d439dc3) | |||
2021-03-03 | SL-14939 Fixed the log spam | Andrey Lihatskiy | |
fix by Ansariel (https://vcs.firestormviewer.org/phoenix-firestorm/changeset/5f927b52fdfeebb5db595c7c60c711cee383820b) | |||
2021-02-01 | Merged 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-29 | SL-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-29 | SL-14732: Merge Sovereign Engineer's cloud patch: Fix writing outside ↵ | Ptolemy | |
outside of the bound fbo in forward render class2 cloud shader | |||
2021-01-29 | SL-14731: Fix sun gamma -- merge Sovereign Engineer's patch: Fix sun gamma ↵ | Ptolemy | |
space for accurate color reproduction of sun textures | |||
2021-01-26 | SL-14766 long unicode display names corrupt the conversation.log | Andrey Kleshchev | |
Contribution by Beq Janus | |||
2021-01-25 | SL-14705: Fix merge conflict | Ptolemy | |
2021-01-22 | SL-14707: Merge Sovereign Engineer's fix for clouds: Clouds are unusually ↵ | Ptolemy | |
dim in EEP | |||
2021-01-22 | SL-3136 Logout crash fixes from Ansariel Hiller | Andrey Kleshchev | |
2021-01-06 | SL-11300 Camera distance to avatar in neighbouring region incorrect | Andrey Kleshchev | |
2021-01-04 | SL-14491 llDialog spacing inconsistent between string and buttons | Andrey Kleshchev | |
2020-12-14 | SL-11300 Camera distance to avatar in neighbouring region incorrect | Andrey Kleshchev | |
2020-12-11 | SL-14518 Trivial changes to settings.xml | Andrey Kleshchev | |
Contribution, move comments to their own lines to simplify parsing | |||
2020-11-11 | Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp | |||
2020-11-11 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/llpanelavatar.cpp | |||
2020-10-26 | SL-13560 Water reflections do not reflect everything when ALM is enabled | Andrey Kleshchev | |
Contribution | |||
2020-10-14 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-10-14 | Merge branch 'master' into DRTVWR-507-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloatermodelpreview.cpp | |||
2020-09-23 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-09-22 | Merge branch 'master' into DRTVWR-507-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp | |||
2020-09-22 | Merged master (DRTVWR-503) into DRTVWR-482 | Andrey Kleshchev | |
2020-09-21 | SL-13697 Items I am wearing continue to go to lost and found | Andrey Kleshchev | |
Contribution from Ansariel Hiller | |||
2020-08-25 | SL-13858 FIXED Group chat transcripts named with double (group) (group).txt ↵ | Mnikolenko Productengine | |
after opening chat history. | |||
2020-08-18 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-08-18 | Merge branch 'master' into DRTVWR-482 | Andrey Lihatskiy | |
2020-08-18 | Merge branch 'master' into DRTVWR-507-maint | Andrey Lihatskiy | |
2020-08-12 | SL-13583 Some behavior tweaks #1 | Andrey Kleshchev | |
2020-08-11 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey Lihatskiy | |
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py | |||
2020-07-22 | SL-13642 Updated contributions.txt | Andrey Lihatskiy | |