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
62b11fc825
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/llappviewer.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/lltoolcomp.h
# indra/newview/lltoolfocus.h
# indra/newview/llviewerhelp.h
# indra/newview/llvoicevivox.h
2023-02-04 13:39:11 +01:00
7cd243238f
Updated Polish translation
2023-02-04 03:52:08 +01:00
7cedcf36e2
Fix OSX build
2023-02-03 21:49:01 +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
e07e23756d
Fix Linux build
2023-02-03 12:57:07 +01:00
4eb139e605
Merge branch 'main' of https://github.com/secondlife/viewer
2023-02-03 00:56:11 +01:00
f156e0771f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 00:55:58 +01:00
8d21d29bd7
Increment viewer version to 6.6.10
...
following promotion of DRTVWR-570
2023-02-02 14:33:39 -05:00
522f516b6a
FIRE-32664 [Starlight skins] Allow the usage of the new 64k character limit in profiles
2023-01-30 08:39:10 +01:00
a44bfe40ee
FIRE-32304 Remove the "View profile" from the V2 context menu for resident's own avatar, as its already listed in Community submenu
2023-01-30 01:23:59 +01:00
c5a1edd23e
Fix XUI warning about missing mandatory parameter
2023-01-29 14:11:11 +01:00
018e260ce6
Clean this up for our yoinking friends...
2023-01-28 13:12:26 +01:00
74b29abfd9
Open keyword help when pressing F1 in script editor
2023-01-27 22:01:04 +01:00
291253d932
FIRE-32105: Application icon flashes also while viewer has focus
2023-01-27 21:30:20 +01: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
2d3ca131e1
C++17 let's go... (and see where some picky compiler complains about again...)
2023-01-26 18:14:02 +01:00
9ba81d7299
Update radar notes column immediately when notes on an avatar's profile were edited.
2023-01-26 14:52:26 +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
f499f0805f
FIRE-32306: Fix the fix
2023-01-25 12:59:32 +01:00
924faa1856
[FIRE-32644]Proxy connect timeout too short
...
Timeout was randomly failing leading to intermittent behaviour with slow localhost proxies and complete failure on network proxies.
2023-01-25 09:38:51 +00:00
ba90e1b1e9
[OpenSim][FIRE-32306] profiles not loading and sundry issues
...
Thanks to Ubit for hint on the misplaced code preventing tab loading
updates to data commit for Notes section, saving should now work.
2023-01-25 09:32:42 +00: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
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
d5fe8e2f3e
Update German translation
2023-01-23 18:21:45 +01:00
94d2f17c6a
Don't copy fonts from 3p packages into the source folder
2023-01-23 18:12:20 +01:00
6ffc7e64d1
[OpenSim] FixUp issues on profiles not updating
...
Profiles were not updating (fixed following suggestion from Ubit - thanks)
Added additional code to save 1st life notes back to server.
2023-01-23 17:11:15 +00:00
9e3079f859
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontregistry.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/widgets/chat_editor.xml
2023-01-23 16:49:24 +01:00
4665a0faa1
Minor gitignore cleanup
...
Also allows for build folders to be links on windows, which is fragile but useful when building
both OS and SL
2023-01-23 10:36:00 +00: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
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
c4f7fbe6a5
Add Beta channel build support
2023-01-20 22:49:07 +00:00
3076d01fb4
update to control build channel from branch
...
oops
2023-01-20 18:47:10 +00:00
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
e02e247d34
Silence stupid Mac complaining about inconsistent override keyword usage
2023-01-19 15:58:11 +01:00
34a444b0b2
Linux: Update FMOD 3p - Patch by PorkChop, thank you!
2023-01-19 12:49:14 +01:00
e60eb81d56
Linux: use system wide fontconfig instead of 3p library, if all goes well we can later remove it from autobuild.xml - patch by PorkChop, thank you!
2023-01-19 12:38:02 +01:00
50e8414428
Fix re-download from secondlife.com error messages.
2023-01-18 22:15:11 +00:00
Ansariel