summaryrefslogtreecommitdiff
path: root/.gitignore
AgeCommit message (Collapse)Author
2024-03-02Merge tag '7.1.3-release'Erik Kundiman
source for viewer 7.1.3.7878383867
2023-12-15Merge tag '7.1.1-release'Erik Kundiman
source for viewer 7.1.1.7039128750
2023-12-15Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/fonts/DejaVu-license.txt # indra/newview/fonts/DejaVuSans-Bold.ttf # indra/newview/fonts/DejaVuSans-BoldOblique.ttf # indra/newview/fonts/DejaVuSans-Oblique.ttf # indra/newview/fonts/DejaVuSans.ttf # indra/newview/fonts/DejaVuSansMono.ttf
2023-12-05Merge branch 'main' into DRTVWR-489Alexander Gavriliuk
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-11-20Ignore .vscodeBennett Goble
Add the commonly autocreated .vscode directory to .gitignore.
2023-10-26Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-10-25Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-08-01Instructions on how to build on some platformsErik Kundiman
plus the ignored build directory if following the instructions.
2023-04-10SL-19078: add filename of emoji/shortcode XML files to ignore list so Viewer ↵Callum Prentice
checkouts don't appear to be polluted with files from 3p libs
2023-04-03DRTVWR-489: Fix things up after a messy merge with main because of a ↵Callum Prentice
gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-11-29SL-18682 WIP -- Clear BOOST_SELECTED as needed. GL 3.2 compatibility pass. ↵Dave Parks
Fix for stack underflow when reflection probes disabled.
2022-11-09Merge branch contribution/emoji into DRTVWR-489-emojiKitty Barnett
2022-10-10Remove cygwin artifactsSignal Linden
2022-09-17SL-17238 Fixed llphysicsextensions connection to llrenderAndrey Kleshchev
2022-08-28Merge branch 'contribution/emoji'Kitty Barnett
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-09-24Ignore build-vc160-64Runitai Linden
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2020-06-23DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476Nat Goodspeed
following release of D512.
2020-06-02Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512Callum Prentice
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-05-04Nonsensical, trivial change to force a build after I ran afoul of a TeamCity ↵Callum Prentice
buildscripts change
2020-03-25Ignore build-vc150-* directories as those are the VS2017 build dirs (n.b. ↵Nicky
due to the rather strange version numbering of VS this really should be build-vc141-*; as VS2017 is vc141 internally).
2020-02-04SL-11445 Couple small fixesAndrey Kleshchev
2020-01-10Convert ignore file to git, add a .clang-format rules fileDave Houlton
2020-01-07Convert ignore file to git, add a .clang-format rules fileDave Houlton
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:26:57 +0000