Andrey Lihatskiy
|
793bed7d06
|
Merge branch 'main' into DRTVWR-489
# 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-15 07:06:15 +02:00 |
|
Alexander Gavriliuk
|
c9cd5631e4
|
Merge branch 'main' into DRTVWR-489
|
2023-12-05 03:37:06 +01:00 |
|
Andrey Lihatskiy
|
d1c0a5b840
|
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
|
2023-11-29 10:45:43 +02:00 |
|
Bennett Goble
|
972bf55d4b
|
Ignore .vscode
Add the commonly autocreated .vscode directory to .gitignore.
|
2023-11-20 08:18:14 -08:00 |
|
Brad Linden
|
673b3309dd
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-10-25 16:12:13 -07:00 |
|
Callum Prentice
|
93717f14ca
|
SL-19078: add filename of emoji/shortcode XML files to ignore list so Viewer checkouts don't appear to be polluted with files from 3p libs
|
2023-04-10 16:58:55 -07:00 |
|
Callum Prentice
|
28b240fd7f
|
DRTVWR-489: Fix things up after a messy merge with main because of a 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-04-03 14:58:58 -07:00 |
|
Brad Linden
|
a548c16989
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-03-29 14:54:06 -07:00 |
|
Dave Parks
|
e46323b0b9
|
SL-18682 WIP -- Clear BOOST_SELECTED as needed. GL 3.2 compatibility pass. Fix for stack underflow when reflection probes disabled.
|
2022-11-29 10:50:25 -06:00 |
|
Kitty Barnett
|
7ebaa2d2e5
|
Merge branch contribution/emoji into DRTVWR-489-emoji
|
2022-11-09 23:25:02 +01:00 |
|
Signal Linden
|
271e6e367e
|
Remove cygwin artifacts
|
2022-10-10 11:23:05 -07:00 |
|
Andrey Kleshchev
|
c333a7935d
|
SL-17238 Fixed llphysicsextensions connection to llrender
|
2022-09-17 19:30:31 +03:00 |
|
Kitty Barnett
|
5440464a9c
|
Merge branch 'contribution/emoji'
|
2022-08-28 00:08:38 +02:00 |
|
Dave Houlton
|
cf35d27dfb
|
DRTVWR-546 merge up to 6.5.2
|
2021-12-15 14:37:18 -07:00 |
|
Runitai Linden
|
d7dea2dd7a
|
Ignore build-vc160-64
|
2021-09-24 15:21:35 -05:00 |
|
Callum Prentice
|
0c89e67eb5
|
DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one.
|
2021-08-20 08:28:48 -07:00 |
|
Nat Goodspeed
|
77cf4588df
|
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
following release of D512.
|
2020-06-23 22:03:43 -04:00 |
|
Callum Prentice
|
d4a38abdf5
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
|
2020-06-02 13:13:53 -07:00 |
|
Nat Goodspeed
|
50a8c2e41a
|
DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.
|
2020-06-02 16:05:56 -04:00 |
|
Callum Prentice
|
27efc55cdb
|
Nonsensical, trivial change to force a build after I ran afoul of a TeamCity buildscripts change
|
2020-05-04 14:24:28 -07:00 |
|
Nicky
|
cb4ca2e41e
|
Ignore build-vc150-* directories as those are the VS2017 build dirs (n.b. due to the rather strange version numbering of VS this really should be build-vc141-*; as VS2017 is vc141 internally).
|
2020-03-25 18:44:04 -04:00 |
|
Andrey Kleshchev
|
e76f25d25f
|
SL-11445 Couple small fixes
|
2020-02-04 16:19:20 +02:00 |
|
Dave Houlton
|
1069673311
|
Convert ignore file to git, add a .clang-format rules file
|
2020-01-10 16:27:33 -07:00 |
|
Dave Houlton
|
391976ffb2
|
Convert ignore file to git, add a .clang-format rules file
|
2020-01-07 15:34:08 -07:00 |