Commit Graph

46396 Commits (a7eef57c1f3f8cd0850bd33b99f150d0e20d3e88)

Author SHA1 Message Date
Callum Linden a7eef57c1f
Merge pull request #183 from secondlife/SL-19575a
SL-19575 LLFloaterEmojiPicker - Add filter by category
2023-04-20 07:19:26 -07:00
Alexander Gavriliuk 97b0ba2a6d SL-19575 LLFloaterEmojiPicker - Add filter by category 2023-04-20 03:55:02 +02:00
Andrey Kleshchev dc5ef88e31 SL-19623 Updated contributions 2023-04-19 20:31:37 +03:00
akleshchev f78773f0c9
SL-19623 Merge 'CMake' pull request #150 from Ansariel
Fix CMake files related to ICU4C
2023-04-19 20:12:48 +03:00
Callum Prentice 8dad411e90 SL-19575: Emoji gallery - couple of tweaks that mac Clang got sad about 2023-04-14 09:05:14 -07:00
Alexander Gavriliuk ff7ebf0892 SL-19575 Create emoji gallery access icon 2023-04-14 17:27:30 +02:00
Callum Prentice 638a45cbb1 DRTVWR-489: Pull in updated version of BugSplat to work around their change in TLS on 2023-04-11 2023-04-13 15:44:40 -07:00
Callum Prentice 602d7ea138 SL-19368: update copyright information in Viewer Fonts description that eventually ends up in the Credits panel of Help->About - new 3p viewer fonts package 2023-04-11 14:18:23 -07:00
Callum Prentice 978a5b66f2 SL-19139 Credits for Kitty - update the contributors.txt file with a mention of Kitty's large contribution. (No externally facing JIRA that I can find) 2023-04-11 11:26:37 -07:00
Callum Prentice 12e044755e SL-19078: changes to autobuild to unpack the emoji/shortcode 3p library and then copy the XML files to the right place in the Viewer dev tree (indra/newview/skins/xui/*/emoji_characters.xml) 2023-04-10 17:01:10 -07:00
Callum Prentice 351faf283a SL-19078: pull in 3p versions of the emoji/shortcode mapping XML files - 1 for each language that the viewer supports except sadly, Turkish which is not available so far 2023-04-10 16:59:45 -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 1bc57d0ae0 SL-19078: the emoji/short-code mappings come in via a 3p package now 2023-04-10 16:57:48 -07:00
Callum Prentice 68612324b8 DRTVWR-489: pull in a version of 3p-ICU4C from the branch called DRTVWR-489-emoji (identical to VS 2019) but lines up the branches for the otehr 3P packages this work uses 2023-04-03 20:19:07 -07:00
Ansariel 337d2f984f Fix CMake files related to ICU4C 2023-04-04 03:32:40 +02: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
Callum Prentice 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
Nat Goodspeed c7053a6928 Increment viewer version to 6.6.11
following promotion of DRTVWR-573
2023-03-29 16:56:36 -04:00
Brad Linden d6cf9e2772 Attempt to fix build breakage for DRTVWR-559 2023-03-27 22:04:02 +03:00
Andrey Lihatskiy c61a2b466a SL-17761 Updated the login failure message 2023-03-27 21:24:36 +03:00
Andrey Lihatskiy 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
Andrey Lihatskiy 79e51195fb SL-19289 UI for Estate Floater - Block Scripted Agents from Estate/Region 2023-03-21 00:05:42 +02:00
Brad Payne (Vir Linden) 72cec2d347 SL-19161 - logging of basic translation stats in ViewerStats 2023-03-20 22:39:48 +02:00
Andrey Lihatskiy 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
Bennett Goble 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
Callum Prentice 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
Callum Prentice abdb4941cf DRTVWR-489: Clean up a new warning-as-error failure on macOS 2023-03-07 14:49:57 -08:00
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
Andrey Kleshchev 0c2b00efaa SL-19346 PERMISSION_DEBIT remove warning for Linden owned content 2023-03-06 22:53:04 +02:00
simon 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
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
simon 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
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
Andrey Kleshchev f60f12d94e SL-19119 Fix mouse steering 2023-02-12 21:52:23 +02: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
Andrey Lihatskiy 7a5381b39f Merge branch 'main' into DRTVWR-573-maint-R 2023-02-02 21:51:07 +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