summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
AgeCommit message (Collapse)Author
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-10-27SL-16127: Make another pass removing redundant LLSD op [] calls, unused ↵Ptolemy
vars, and use atmospheric already calculated
2021-09-22SL-15958 Stop impostored avatars from casting shadowsMnikolenko Productengine
2021-09-03SL-15709: Add Tracy support to viewerPtolemy
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-19Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llappcorehttp.cpp # indra/newview/llappcorehttp.h
2021-06-25Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-06-25Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-06-14Add in the JIRA (SL-15398) describing the contribution from FS:Ansariel to ↵Callum Prentice
the contributions.txt file
2021-06-10Fix for SL-15382 Update contributions text file in ViewerCallum Prentice
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-516-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 09:57:02 +0000