Commit Graph

46148 Commits (b54c0f4fc18a25a2e454d3d24f3f2bfc4aff6452)

Author SHA1 Message Date
Callum Linden b54c0f4fc1 DRTVWR-489: Pull in updated 3p-freetype package with Kitty's latest changes 2023-03-07 14:47:10 -08:00
Callum Linden 6b0b751a20
Merge pull request #83 from KittyBarnett/DRTVWR-489-emoji
Drtvwr 489 emoji
2023-03-07 11:46:27 -08:00
Kitty Barnett 4072fd84fb Merge branch 'DRTVWR-489-emoji-PR' 2023-02-20 23:52:00 +01:00
Callum Linden 98f0656f5c
Merge pull request #82 from KittyBarnett/xcode-14.1
Xcode 14.1
2023-02-14 13:53:27 -08:00
Callum Linden 3c719cc980
Merge branch 'DRTVWR-489-emoji-PR' into xcode-14.1 2023-02-14 13:52:18 -08:00
Callum Prentice 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: 3185bdea27,
923733e591 and 6f31fabbc2)
2023-02-14 17:01:22 +01:00
Callum Prentice a92f08b2bc Fix up a couple of tiny merge conflicts after a merge with main 2023-02-13 15:08:51 -08:00
Callum Prentice 422cd237df Fix up a couple of tiny merge conflicts after a merge with main 2023-02-13 14:12:59 -08:00
Kitty Barnett 77afc073c5 Merge branch 'xcode-14.1' into DRTVWR-489-emoji 2023-02-08 17:18:37 +01:00
Kitty Barnett 4df2c0b8d6 Post-merge fix for xcode-14.1 branch 2023-02-08 17:17:47 +01:00
Kitty Barnett 7b563470fb Merge branch 'main' into xcode-14.1 2023-02-08 14:56:38 +01:00
Kitty Barnett 5805bbd810 Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer into DRTVWR-489-emoji 2023-02-08 14:52:16 +01:00
Andrey Kleshchev b2f890408e SL-19089 Changing UI scale crashes viewer
This makes no sense, trying to add a glyph now will have no width or height set, neither character width or heigh, yet release viewer does that. Fixed code to match release and set width and height despite char width not being up to date.
2023-02-03 20:50:43 +02:00
Nat Goodspeed 8d21d29bd7 Increment viewer version to 6.6.10
following promotion of DRTVWR-570
2023-02-02 14:33:39 -05:00
Andrey Lihatskiy 71657b66f9 Revert "SL-18581 Don't show the starter avatar toolbar button for NUX"
This reverts commit 4d429b7ea3.
2023-01-27 22:04:11 +02:00
Callum Prentice 6f31fabbc2 DRTVWR-489-emoji: less haste. more speed. Missed another test issue. Rebuilt locally with tests and confirmed it works now 2023-01-26 19:17:21 -08:00
Callum Prentice 923733e591 DRTVWR-489-emoji: missed the override warning/error in the tests... grr... 2023-01-26 18:01:25 -08:00
Callum Prentice 99779d97f1 DRTVWR-489-emoji: Pull in the updated version of GoogleMock that was updated to Python3 so that it builds on macOS in TeamCity 2023-01-26 17:46:56 -08:00
Callum Prentice d9e82ab14a DRTVWR-489-emoji: Pull in some small changes from Kitty's work to move the macOS build forwards 2023-01-26 17:04:35 -08:00
Callum Prentice a804b98e4e DRTVWR-489-emoji: A couple of tabs slipped into this file and our new no-tabs coding policy caught it and failed the build 2023-01-26 17:03:58 -08:00
Callum Prentice 3185bdea27 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 2023-01-26 14:45:45 -08:00
Callum Prentice fb00bce81a Merge branch 'xcode-14.1' into DRTVWR-489-emoji 2023-01-26 10:37:59 -08:00
Kitty Barnett da0335c864 Fix Mac build
- Link against ICU4C
  - Font files were only copied on Windows builds
  - Replace missing variable
2023-01-25 20:31:04 +01:00
Callum Linden 66f59478d0 DRTVWR-489-emoji: declaring this variable as a U16 leads to a warning (and therefore an error) but only on 32bit Windows builds - 64bit is fine. I don't know why that's the case (should be both surely) but in any case, I think the variable should be declared as a size_t 2023-01-25 10:57:29 -08:00
Callum Linden 5dcdf83304 DRTVWR-489-emoji: Trying to get to the bottom of a TeamCity build failure with access to TeramCity - with all the ICU4C DLLs removed, the viewer builds fine which does suggest a size/disk space issue. Trying with the (porposed) minimum set to see if this helps. Likely it won't because the main one (icudt48.dll) is much, much bigger than the others combined - but we shall see 2023-01-24 16:00:53 -08:00
Callum Linden 054f571515 DRTVWR-489-emoji: Trying to get to the bottom of a TeamCity build failure with access to TeramCity - one theory is that the extra size of these DLLs consumes too much disk space and results in the NSIS internal compiler error we observe - removing these tempoorarily to see what difference that makes 2023-01-24 13:14:25 -08:00
Callum Linden a3e80762f1 DRTVWR-489-emoji: Fix a warning when packaging Viewer installer. TeamCity builds fail because of 'compiler error' in NSIS - wondering if this warning triggers the error (it doesn't locally) - yes, grasphing at straws 2023-01-24 11:07:56 -08:00
Callum Linden 68b59629c4 DRTVWR-489-emoji: Pull in the updated ICU4C package that puts the libs and dlls in the right place for the Windows builds 2023-01-23 17:21:52 -08:00
Callum Linden f9fbd0333a DRTVWR-489-emoji: Update the machinery that copies over the ICU4C DLLs into the right place in Windows builds 2023-01-23 15:10:17 -08:00
Callum Linden 64e84924d4 DRTVWR-489-emoji: Pull in updated viewer-fonts package that includes 'missing' Tweenmoji SVG font 2023-01-23 12:36:37 -08:00
Callum Linden 44a5519fb0 DRTVWR-489-emoji: Pull in an updated version of 3p-icu4c that correctly copies over the Windows DLLs as part of the build process 2023-01-20 17:18:13 -08:00
Callum Linden cbb7480ca7 Fix merge conflicts after auto merge 2023-01-20 16:23:41 -08:00
Callum Linden 80bc32c3ef Pull in (a) version of ICU4C - this one was built with VS 2019 and not VS 2017 like everything else. The work to do this is large and we are switching soon to VS 2022 so this will do for now 2023-01-20 15:17:45 -08:00
Callum Linden 7a3ef9e5ac DRTVWR-489-emoji: following kitty's recipe for emoji viewer - this pulls in 3p library changes for steps 1-5 (boost, colladom, googlemock, nanosvg, viewer-fonts) - final 3p change (ICU4C) coming later 2023-01-19 17:40:16 -08:00
Andrey Kleshchev b3201e75b1 SL-18945 Links have no 'cut' option
Links can be drag and dropped so they should be movable via 'cut' as well
2023-01-11 16:03:33 +02:00
Andrey Kleshchev 007939f0a7 SL-18939 Cannot copy inventory folders with copiable links 2023-01-11 08:30:32 +02:00
akleshchev f3cd329b58
SL-18911 My Land Holdings floater crashes viewer on the Xcode/+Monterey branches (#47)
Revert part of "DRTVWR-575: Address review comments on Xcode 14.1 type tweaks."
Crash was reproduced when assigning areastr to llsd, but likely present in other cases of assigning ui strings to llsd (instead of going for lluistring's result directly copy constructor was engaged and either copy or original crashed due to invalid pointers, copy shouldn't have been created).
2023-01-10 19:38:44 +02:00
Andrey Kleshchev 30678472ee Revert "SL-18911 [MAC] My Land Holdings floater crashes when not empty"
This reverts commit d6f5e5bc94.
2023-01-07 18:59:39 +02:00
Andrey Kleshchev d6f5e5bc94 SL-18911 [MAC] My Land Holdings floater crashes when not empty 2023-01-07 01:10:22 +02:00
Kitty Barnett 12204b210e Merge remote-tracking branch 'origin/master' into DRTVWR-489-emoji 2023-01-06 16:40:33 +01:00
Andrey Kleshchev 73933fe778 SL-18894 The change of 'modify rights' is not recorded in IM history if the user is in DND mode
Revert of commit for SL-15401. Messages are supposed to handle 'mute' on their own.
2023-01-05 18:21:53 +02:00
Andrey Kleshchev 3fd86c2f23 SL-18871 Debug setting's description is not scrollable 2023-01-05 01:34:03 +02:00
Nat Goodspeed 99c040ea99 DRTVWR-575: Fix possible bad indexing in LLSD::operator[](size_t).
One could argue that passing a negative index to an LLSD array should do
something other than shrug and reference element [0], but as that's legacy
behavior, it seems all too likely that the viewer sometimes relies on it.

This specific problem arises if the index passed to operator[]() is negative
-- either with the previous Integer parameter or with size_t (which of course
reinterprets the negative index as hugely positive). The non-const
ImplArray::ref() overload checks parameter 'i' and, if it appears negative,
sets internal 'index' to 0.

But in the next stanza, if (index >= existing size()), it calls resize() to
scale the internal array up to one more than the requested index. The trouble
is that it passed resize(i + 1), not the adjusted resize(index + 1).

With a requested index of exactly -1, that would pass resize(0), which would
result in the ensuing array[0] reference being invalid.

With a requested index less than -1, that would pass resize(hugely positive)
-- since, whether operator[]() accepts signed LLSD::Integer or size_t,
resize() accepts std::vector::size_type. Given that the footprint of an LLSD
array element is at least a pointer, the number of bytes required for
resize(hugely positive) is likely to exceed available heap storage.

Passing the adjusted resize(index + 1) should defend against that case.
2023-01-04 17:18:31 -05:00
Nat Goodspeed 4093d5b1eb DRTVWR-575: Use llsdutil.h functions for LLFloaterLandHoldings LLSD
LLFloaterLandHoldings::postBuild() was constructing an LLSD structure by
assigning each map entry and array element one at a time. Chorazinallen
identified a crash bug possibly caused by destroying that LLSD structure.
Diagnostically try building it using nested llsd::map() and llsd::array()
calls instead to see if that improves matters.
2023-01-04 15:13:02 -05:00
Nat Goodspeed aa112ef17f DRTVWR-575: Fix bug in macOS micro_sleep().
The compiler was deducing an unsigned type for the difference (U64 desired
microseconds - half KERNEL_SLEEP_INTERVAL_US). When the desired sleep was less
than that constant, the difference went hugely positive, resulting in a very
long snooze.

Amusingly, forcing that U64 result into an S32 num_sleep_intervals worked only
*because* of integer truncation: the high-order bits were discarded, resulting
in a negative result as intended.

Ensuring that both integer operands are signed at the outset, though, produces
a more formally correct result.
2023-01-04 12:04:56 -05:00
Nat Goodspeed bb718155bd DRTVWR-575: Replace some LLSDArray() usage with llsd::array().
It seems newer compilers have a different interpretation of exactly when to
engage LLSDArray's copy constructor. In particular, this assignment:

some_LLSD_map[key] = LLSDArray(...)(...)...;

used to convert the LLSDArray object directly to LLSD; now it first calls the
custom copy constructor, which embeds the intended array within an outer array
before assigning it into the containing map.

The newer llsd::array() function avoids that problem because what it returns
is already an LLSD object.

Taking inventory of LLSDArray assignments of that form turned up a number of
workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is
both simpler and more readable.

Tip of the hat to Chorazinallen for surfacing this issue!
2023-01-03 18:06:45 -05:00
Andrey Kleshchev 6f522084ed SL-18426 At log in only a part friends reported to chat as online
Server sends updates in bulk now, so notify per agent instead of per update
2022-12-20 02:03:03 +02:00
Andrey Kleshchev 07baa83ef2 SL-18384 Fix NSException for keyboard handling
Affects accent keys for diacritical marks
2022-12-16 16:31:42 +02:00
Callum Prentice 6daa0a9ecb Merge branch 'main' into DRTVWR-489-emoji 2022-12-12 11:05:24 -08:00
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00