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
7b9866791a
DRTVWR-489-emoji-PR: Pull in a version of Collada that has std::auto_ptr replaced by std::unique_ptr so it builds on modern mac systems
2023-03-31 16:29:36 -07:00
c7053a6928
Increment viewer version to 6.6.11
...
following promotion of DRTVWR-573
2023-03-29 16:56:36 -04:00
d6cf9e2772
Attempt to fix build breakage for DRTVWR-559
2023-03-27 22:04:02 +03:00
c61a2b466a
SL-17761 Updated the login failure message
2023-03-27 21:24:36 +03:00
9da0f76d2c
SL-19462 Declare the FetchGroupChatHistory setting in the code
...
to make it accessible after updating the viewer
2023-03-23 14:35:55 +02:00
79e51195fb
SL-19289 UI for Estate Floater - Block Scripted Agents from Estate/Region
2023-03-21 00:05:42 +02:00
72cec2d347
SL-19161 - logging of basic translation stats in ViewerStats
2023-03-20 22:39:48 +02:00
dca3c83cd9
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
ffa8d83eaf
SL-17761: Replace 'Grid emergency' message with generic error
...
The viewer currently presents a startling "Grid emergency" warning if an
unrecognized error is returned from login. Let's tone this down a bit
and present the error as it is: an unrecognized login failure rather
than SLearth exploding.
2023-03-13 14:36:08 +02: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
6b0b751a20
Merge pull request #83 from KittyBarnett/DRTVWR-489-emoji
...
Drtvwr 489 emoji
2023-03-07 11:46:27 -08:00
0c2b00efaa
SL-19346 PERMISSION_DEBIT remove warning for Linden owned content
2023-03-06 22:53:04 +02:00
9ee7c2598e
SL-18268 - merge fix for viewer update to read group chat history
...
added missing app setting
2023-03-01 15:09:56 -08:00
4072fd84fb
Merge branch 'DRTVWR-489-emoji-PR'
2023-02-20 23:52:00 +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
f257ee7d3c
SL-18268 - Viewer update to read group chat history.
...
Feature described at https://community.secondlife.com/blogs/entry/12652-coming-soon-to-a-viewer-near-you-group-chat-history/
2023-02-13 15:19:27 -08:00
a92f08b2bc
Fix up a couple of tiny merge conflicts after a merge with main
2023-02-13 15:08:51 -08:00
422cd237df
Fix up a couple of tiny merge conflicts after a merge with main
2023-02-13 14:12:59 -08:00
f60f12d94e
SL-19119 Fix mouse steering
2023-02-12 21:52:23 +02: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
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
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02:00
8d21d29bd7
Increment viewer version to 6.6.10
...
following promotion of DRTVWR-570
2023-02-02 14:33:39 -05:00
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
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
923733e591
DRTVWR-489-emoji: missed the override warning/error in the tests... grr...
2023-01-26 18:01:25 -08:00
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
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
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
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
fb00bce81a
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
2023-01-26 10:37:59 -08:00
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
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
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
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
6dec98a14c
SL-17425 Crash when having more than one dependent floater #2
2023-01-24 21:51:43 +02:00
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
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
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
64e84924d4
DRTVWR-489-emoji: Pull in updated viewer-fonts package that includes 'missing' Tweenmoji SVG font
2023-01-23 12:36:37 -08:00
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
cbb7480ca7
Fix merge conflicts after auto merge
2023-01-20 16:23:41 -08:00
Callum Prentice