b6e9dcc4e8
Merge branch 'DRTVWR-489-emoji-PR' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llmeshrepository.cpp
2023-03-21 12:21:56 +01:00
ba2477b07d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-21 12:06:02 +01:00
b2d064a561
Merge branch 'DRTVWR-489-emoji-PR' of github.com:secondlife/viewer into DRTVWR-489-emoji-PR
2023-03-07 14:50:20 -08:00
abdb4941cf
DRTVWR-489: Clean up a new warning-as-error failure on macOS
2023-03-07 14:49:57 -08:00
b54c0f4fc1
DRTVWR-489: Pull in updated 3p-freetype package with Kitty's latest changes
2023-03-07 14:47:10 -08:00
54c4f5ba0d
Clean up as we go to allow Linux bloat monster to build.
...
clean up ~25G wasted space on Linux build server
Linux only
Try gcc=10
Add swap space back
2023-03-07 22:17:58 +00:00
6b0b751a20
Merge pull request #83 from KittyBarnett/DRTVWR-489-emoji
...
Drtvwr 489 emoji
2023-03-07 11:46:27 -08:00
35ee14193e
Merge branch 'revisitriggedlocalmesh'
2023-03-06 11:13:21 +00:00
960edca234
Merge remote-tracking branch 'origin/master'
2023-03-06 11:09:05 +00:00
0d72cb7f6e
Fix warning about missing color definition for NotecardTextColor
2023-02-24 14:48:46 +01:00
72d606751b
FIRE-32749 Russian translation update, by Romka Swallowtail
2023-02-22 02:45:27 +01:00
4072fd84fb
Merge branch 'DRTVWR-489-emoji-PR'
2023-02-20 23:52:00 +01:00
9d34700179
experimental workaround to non-rigged to rigged transition bug
2023-02-19 22:36:14 +00:00
712031bb2f
changes towards fixing rigged local mesh WiP
2023-02-19 22:36:14 +00:00
6a92614003
Merge branch 'improve-gha-build'
2023-02-19 22:35:33 +00:00
ea2fa8db13
FIRE-32739 French translation update, by Laurent Bechir
2023-02-19 06:26:24 +01:00
7d5c93ce8b
Update GHA to improve handling of new 3p bundles.
...
also Update ubuntu to 20.04
deal with macOS being out of date (not to mention BSD)
handle case where some 3ps are generic (32/64)
2023-02-18 14:37:24 +00:00
3e96187edf
Improve GHA builds
...
- make sure we use the latest bundles provided
- rearrange things a little.
- make some initial steps towards trying to make things fail when config/build fails.
Improve OS/SL config switch
always use latest package version (by timestamp)
try another method that deals with not found (looking at you linux havok)
oops
I hate shell bl@*&y scripts
fix pattern
revert the autobuild version
wth
this makes no sense
fs-variables must be imported after the code
2023-02-18 14:37:24 +00:00
4286f0b112
Restore Perf tracking for non-alpha blend
...
Verified that this does not impact the previously associated JIRAs FIRE-31986, FIRE-31979
2023-02-18 14:29:02 +00:00
dc4a2c2b4c
Updated Polish translation
2023-02-17 22:24:47 +01:00
69a01606c1
FIRE-32736: Add confirmation before ungrouping folder
2023-02-17 15:24:31 +01:00
79c9873cd0
Linux: Pull in Alchemy's vertex cache optimizer fix to smooth out triangle soup in certain hair/tails - Thank you!
2023-02-16 17:46:43 +01:00
baa9c6d731
Linux: CEF bump from 91 -> 92 -- note, it is not possible to upgrade to later versions of CEF beyond 92 due to API changes introduced in later versions of CEF - this situation will of course change once the viewer source is updated to be compatible with the later CEF API's
2023-02-17 02:59:35 +11:00
000691bf2b
Linux: FIRE-32559: vsync not working after restart, also: remove weird inverted vsync logic for SDL based windows which was not even implemented correctly
2023-02-16 15:06:33 +01:00
a08e6d5a8f
FIRE-32722: Make sure to idle if actually minimize
2023-02-15 14:31:37 +01:00
98f0656f5c
Merge pull request #82 from KittyBarnett/xcode-14.1
...
Xcode 14.1
2023-02-14 13:53:27 -08:00
3c719cc980
Merge branch 'DRTVWR-489-emoji-PR' into xcode-14.1
2023-02-14 13:52:18 -08:00
547c0665ea
DRTVWR-489-emoji: As part of the work to get macOS version of the Viewer working, the flag was introduced to warn (and therefore error out) when a virtual override was not marked with the 'override' keyword. Fixing this up involved a large number of changes and this commit represents just those changes - nothing specially from the DRTVWR-489 viewer
...
(Cherry pick of 3 commits from Callum to declutter the emoji PR: 3185bdea27923733e5916f31fabbc2
2023-02-14 17:01:22 +01:00
a92f08b2bc
Fix up a couple of tiny merge conflicts after a merge with main
2023-02-13 15:08:51 -08:00
eb4c6a3d04
FIRE-32718 Statistics Bar - Active Object - Mouseover Text
2023-02-13 23:22:37 +01:00
422cd237df
Fix up a couple of tiny merge conflicts after a merge with main
2023-02-13 14:12:59 -08:00
c6bc3120d7
Minor Polish translation adjustments
2023-02-13 21:24:04 +01:00
de1b7985d1
Revert "Add /LTCG linker flag for viewer binary due to libpng update" until libpng gets updated again eventually
...
This reverts commit f7ae4930f5
2023-02-10 01:18:48 +01:00
1e64098519
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llpathfindingnavmesh.cpp
2023-02-10 01:17:17 +01:00
3079cda486
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llmeshrepository.cpp
# indra/newview/llvoicevivox.h
2023-02-10 00:50:19 +01:00
9662c12158
DRTVWR-489-emoji: additional tweaks necessary to get the macOS build into shape
2023-02-08 19:40:24 -08:00
77afc073c5
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
2023-02-08 17:18:37 +01:00
4df2c0b8d6
Post-merge fix for xcode-14.1 branch
2023-02-08 17:17:47 +01:00
7b563470fb
Merge branch 'main' into xcode-14.1
2023-02-08 14:56:38 +01:00
5805bbd810
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer into DRTVWR-489-emoji
2023-02-08 14:52:16 +01:00
afede9086a
Linux: Update openjpeg library (now built on focal). Previous version built on Bionic (which is imminent of being EOL) introduced some compatibility issues on systems with glibc 2.31 and beyond and resulted in linker failures.
2023-02-06 11:36:24 +11:00
9cee21ba8d
Updated Havok TPV lib to work with latest LL release
2023-02-05 15:20:34 +01:00
b6085fc90e
Openjpeg: Deprecation warning fix - dont set bpp in cmptparm when calling opj_image_create() as it is deprecated in favor of setting prec instead, remove redundant setting of bpp to squelch the warning
2023-02-05 19:18:18 +11:00
f41d6250ac
Revert "Linux: Stop GCC complaining about deprecated functions in target llimagej2coj"
...
This reverts commit e860d7ab59
2023-02-05 18:34:46 +11:00
e860d7ab59
Linux: Stop GCC complaining about deprecated functions in target llimagej2coj
2023-02-05 12:50:32 +11:00
0f64c31fcd
[FIRE-32599] Local Mesh - Add Support for broken collada (autodesk)
...
reuses the same LLDAELoader function.
2023-02-05 01:24:27 +00:00
2c11c3d935
Merge remote-tracking branch 'origin/master'
2023-02-04 20:43:02 +00:00
5eae4f873f
Linux: Update openjpeg library from 2.3.1 to 2.5.0
2023-02-05 07:10:20 +11:00
dd3dd51791
Linux: Update apr suite (sync with latest from LL)
2023-02-05 07:09:01 +11:00
6341b420d1
[FIRE-32624]++ Local Mesh floater is now better behaved
...
weird scrolly-not-scrolly fun on the log tab fixed
made the floater resizable
made the objects list scroll when it gets long enough.
fixed irritating border clippage on the setting tab.
2023-02-04 18:56:07 +00:00
Ansariel