Commit Graph

1856 Commits (e43c4c78b39b9208b1e3cdd26c20d9257d4df184)

Author SHA1 Message Date
Andrey Lihatskiy 71ed19839e Merge branch 'main' into DRTVWR-600-maint-A
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterchangeitemthumbnail.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llvovolume.cpp
2024-03-27 00:45:06 +02:00
Andrey Lihatskiy 1ae6f5dd6f Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
#	indra/llui/lltransutil.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloaterenvironmentadjust.cpp
#	indra/newview/llpaneleditwater.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
2024-03-27 00:33:40 +02:00
Andrey Lihatskiy 78174fc865 Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts:
#	.github/workflows/build.yaml
2024-03-27 00:14:56 +02:00
Roxie Linden 0e2fc4d35e Clear out observers when terminating a connection 2024-03-19 17:05:56 -07:00
Roxie Linden 3794e3275c use the github release asset path for autobuild webrtc 2024-03-18 17:32:51 -07:00
Roxie Linden 2f40b1fcef update to use public github-based release of autobuild webrtc 2024-03-18 17:13:36 -07:00
Roxie Linden 0e7b5f5270 Update paths for webrtc-shim 2024-03-15 12:24:37 -07:00
Henri Beauchamp 2f452d06e6 Proposal #2 to restore how UI/dialogs used to render by prioritizing fallback fonts.
With the emojis support, a new font was added, which not only provides emojis
but also fancy colorful replacements for UTF-8 characters that used to be
supported by our fallback (monochrome) fonts: this causes discrepancies and
unwanted/undesired changes in scripted objects menus (e.g. an empty circle or
square may render as a black, full one, a heart may render red instead of white),
not to mention the larger font size used by the emoji characters...

This patch restores the aspect of such menus/dialogs/UI elements with UTF-8
characters that *are* supported by the usual fallback fonts (fonts which may
also vary from one viewer to another, and from one OS to another), so that
everything keeps working/rendering as it always did so far, while not impairing
the use of new colorful emojis.

This second proposal ensures that:
- "genuine" emojis (in the 0x1f000-0x1ffff range), will *always* be rendered
  using the new emojis font (this solves, for example, the monochrome "yellow
  faces" issue seen with some characters in my first proposal).
- Special UTF-8 characters (in the 0x2000-0x32FF range) which have been used by
  scripters so far, will render as they used to, using the monochrome fallback
  fonts (this repairs scripted dialogs menus).
- Remaining special characters, that do not have a corresponding glyph in the
  monochrome font, but do have one in the emojis font, will use the latter font
  to render.

It also got the nice side-effect of removing the dependency on the ICU4C library.

Note however that the recent commit:
326055ba82
will need to be reverted to allow this patch to actually fix scripted dialogs.

Also, some cleanup might be needed in skins/default/xui/*/emoji_characters.xml to
remove from it the special UTF-8 characters that will no longer be rendered with
fanciful colors, but instead with the monochrome font glyphs.
2024-03-14 01:47:14 +02:00
RunitaiLinden 4c3d090bf4 #926 Unshuffle autobuild.xml 2024-03-13 14:47:31 -05:00
RunitaiLinden 5c605a60f5 Revert "secondlife/viewer#926 further work on mac openexr lib."
This reverts commit ce6170802d.
2024-03-13 14:42:22 -05:00
Brad Linden ce6170802d secondlife/viewer#926 further work on mac openexr lib.
switching mac lib to be statically linked

autobuild installables edit openexr platform=darwin64 url=https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-darwin64-df7544d.tar.zst hash_algorithm=sha1 hash=17cd63922214b588d9a36137fadf927237ec0f25
autobuild installables edit openexr platform=linux64 url=https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-linux64-df7544d.tar.zst hash_algorithm=sha1 hash=b092658ab5ec009a5875e8b6e5b7109730ad6846
autobuild installables edit openexr platform=windows64 url=https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-windows64-df7544d.tar.zst hash_algorithm=sha1 hash=c511ae9a3e401375af2199b498a75f32cebc010f
2024-03-12 16:46:48 -07:00
Ansariel eb1ed3896f Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontbitmapcache.cpp
#	indra/llrender/llfontbitmapcache.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llui/llbutton.h
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/llscrollcontainer.cpp
#	indra/llui/llscrollingpanellist.cpp
#	indra/llui/llscrollingpanellist.h
#	indra/llui/llscrolllistctrl.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llui/lluictrl.cpp
#	indra/llui/llview.cpp
#	indra/llui/llview.h
#	indra/newview/llchicletbar.h
#	indra/newview/llconversationlog.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterimsessiontab.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpaneltopinfobar.h
#	indra/newview/llpathfindingpathtool.h
#	indra/newview/lltextureview.cpp
#	indra/newview/lltoolbrush.h
#	indra/newview/lltoolcomp.h
#	indra/newview/lltooldraganddrop.h
#	indra/newview/lltoolface.h
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolindividual.h
#	indra/newview/lltoolobjpicker.h
#	indra/newview/lltoolpie.h
#	indra/newview/lltoolpipette.h
#	indra/newview/lltoolselectland.h
#	indra/newview/llviewermediafocus.h
#	indra/newview/llviewerparcelmediaautoplay.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoicevivox.h
#	indra/newview/llworldmapview.cpp
2024-03-12 16:52:30 +01:00
Roxie Linden d67a3022d3 Merge branch 'main' of github.com:secondlife/viewer-private into roxie/webrtc-voice 2024-03-10 15:36:58 -07:00
Roxie Linden 994039c948 Use webrtc autobuild package 2024-03-08 22:49:05 -08:00
RunitaiLinden c1bde75768
HDRI Local Preview (#953)
* #926 WIP - HDRI import prototype v0

* #926 WIP -- add OpenEXR to autobuild.xml

* #926 WIP -- Add OpenEXR cmake

* #926 WIP -- Attempt at using OpenEXR autobuild package and don't hard code .exr file to load

* #926 Unmangle autobuild.xml and get dll's in the right place (thanks, Caladbolg!)

* implement mac shared libs plumbing for OpenEXR for secondlife/viewer#926

* Fix Xcode/clang compile error regarding new[]/delete[] mismatch

* #926 HDRI Preview finishing touches.

- Full ACES when HDRI is enabled
- Fix for probes getting stuck paused
- Add exposure and rotation controls

---------

Co-authored-by: Brad Linden <brad@lindenlab.com>
2024-03-08 12:01:20 -06:00
Andrey Kleshchev be35287184 SL-20429 Fix emoji categories having mixed translations
Was caused by package substituting '&' with 'and' instead of '&amp;'
2024-03-06 12:42:57 +02:00
Andrey Lihatskiy b68a05e7c3 Merge branch 'main' into marchcat/x-merge
# Conflicts:
#	indra/llcommon/llstring.cpp
#	indra/llcommon/llstring.h
2024-03-04 18:01:05 +02:00
Brad Linden 258c039584 Merge remote-tracking branch 'origin/main' into release/gltf-maint2 2024-03-01 10:12:00 -08:00
Andrey Lihatskiy faf69f407f Merge branch 'main' into marchcat/yz-merge
# Conflicts:
#	indra/newview/llinventorygallery.cpp
2024-03-01 18:02:48 +02:00
Andrey Lihatskiy 6d077c90a0 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-01 17:30:06 +02:00
Andrey Kleshchev 762855f255 SL-19585 Try replacing fmod with openal
Since now VLC is responsible for played parcel media (should be since
SL-19042) should be possible to switch remaining audio to OpenAL with
no loss of functionality
2024-02-09 01:31:50 +02:00
Andrey Lihatskiy ea916ad950 DRTVWR-594 Update llca to version 202402012004.0 2024-02-02 00:23:36 +02:00
Andrey Kleshchev 39aefc63d1 Issue #716 Update Fmod Studio to version 2.02.20 2024-02-01 21:56:26 +02:00
Nat Goodspeed 0752cc0792 DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs 2024-01-19 11:38:02 -05:00
Ansariel Hiller 0fa6ff2b1f
Undo re-ordering of autobuild.xml (#638) 2024-01-16 11:08:39 -06:00
RunitaiLinden fab4cfbab2 SL-20704 Fix for pathfinding debug display not working. 2024-01-10 13:50:15 -06:00
Andrey Kleshchev 6e6df8c31e SL-20747 Fix pshell command failing in some cases 2024-01-08 19:27:58 +02:00
Nat Goodspeed bc3076938e DRTVWR-601: Update xxhash common platform to GHA build.
Remove identical platform-specific package references.
2023-12-20 12:50:34 -05:00
Nat Goodspeed 6f4dcd58b7 DRTVWR-601: Update mikktspace, tinygltf, tracy, vulkan_gltf, xxhash
to latest GitHub builds. Some of these were still referencing codeticket
builds produced by TeamCity.
2023-12-18 14:47:03 -05:00
Andrey Lihatskiy aed6313d7c Merge branch 'main' into DRTVWR-594-maint-Y 2023-12-18 06:33:57 +02:00
Nat Goodspeed 67da0c7f60 DRTVWR-601: Update vulkan_gltf to GHA build. 2023-12-15 16:23:49 -05:00
Nat Goodspeed d07cd115e3 DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub. 2023-12-15 16:14:38 -05:00
Nat Goodspeed 1df31d64e8 DRTVWR-601: Update mikktspace and tinygltf to GHA package builds.
Ditch 32-bit Windows build of mikktspace.
2023-12-15 16:13:51 -05:00
Andrey Lihatskiy 793bed7d06 Merge branch 'main' into DRTVWR-489
# Conflicts:
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
Andrey Lihatskiy 4b98ae6e8a Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
#	indra/newview/llspatialpartition.cpp
2023-12-14 02:47:44 +02:00
Andrey Lihatskiy 88921452ad DRTVWR-489 Restore autobuild.xml format 2023-12-13 06:26:06 +02:00
Andrey Lihatskiy 5b789e05f5 DRTVWR-489 Update freetype to v.2.12.1.557becd 2023-12-12 19:02:54 +02:00
Alexander Gavriliuk eff5958c11 Fix formatting in autobuild.xml (indents in close tags) 2023-12-05 20:37:21 +01:00
Andrey Lihatskiy 86a437d96c DRTVWR-587 Update llca to version 202312051404.0 2023-12-05 18:40:08 +02:00
Andrey Lihatskiy 07ace73c49 DRTVWR-587 Update llca to version 202312051404.0 2023-12-05 16:17:04 +02:00
Alexander Gavriliuk c9cd5631e4 Merge branch 'main' into DRTVWR-489 2023-12-05 03:37:06 +01:00
Andrey Lihatskiy c409236dac Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge
# Conflicts:
#	indra/newview/llinventorygallery.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
2023-11-30 18:09:29 +02:00
Andrey Lihatskiy d1c0a5b840 Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewergenericmessage.cpp
#	indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
Nat Goodspeed 974a2a1d40 DRTVWR-587: Update to viewer-manager v3.0-08bf5ee.
This viewer-manager refactors the bad-graphics-card detection.
2023-11-22 14:12:46 -05:00
Nat Goodspeed faadebbb69 DRTVWR-594: Update kdu version from the updated package. 2023-11-22 10:25:06 -05:00
Nat Goodspeed fe30ed1b49 DRTVWR-594: Update havok-source with havok-libs per recent PR. 2023-11-21 17:02:52 -05:00
Nat Goodspeed 8e3253dc1a DRTVWR-594: Update kdu per recent PR 2023-11-21 16:36:13 -05:00
Nat Goodspeed 426cf29278 DRTVWR-594: Update dictionaries, glh_linear, havok-source
per recent PRs. Actually the havok-source update is for a new havok-llvm build.
2023-11-21 15:34:26 -05:00
Andrey Kleshchev a963ba296e SL-20591 Update viewer-manager to v3.0.0170afb
Restored removed commits since issue was isolated and bypassed.

Original issue: win32util.py imports wmi, if import fails it uses
registry for getting dns, if import works, it uses wmi to get dns.
Including wmi broke dns for some of the users ([Errno 11001] Name or
service not known)
2023-11-21 19:33:54 +02:00
Andrey Kleshchev 2f735f6909 SL-20591 Update viewer-manager to v3.0.73fef89 2023-11-17 02:33:53 +02:00
Andrey Lihatskiy 96f7f708c1 SL-20591 Update viewer-manager to v3.0.0395b15 2023-11-10 01:57:27 +02:00
Andrey Kleshchev 9b6a90eedd Revert "SL-20185 Fix connection issues (#490)"
Issue reproed again, restoring.
2023-11-06 20:41:01 +02:00
akleshchev 6aa4a267a7
SL-20185 Fix connection issues (#490) 2023-11-03 00:10:50 +02:00
Andrey Lihatskiy 54bfff622d DRTVWR-594 Update LLCA to v202311020117.0-0f5d9c3 2023-11-02 01:23:33 +02:00
Nat Goodspeed 66ae2434bc DRTVWR-587: Update viewer-manager to v3.0-074736e.
This is viewer-manager's DRTVWR-587-actions branch updated from the new master
branch.
2023-10-31 13:40:07 -04:00
Nat Goodspeed b5c7c6b078 SL-20031: Reintroduce newest viewer-manager build. 2023-10-31 11:04:41 -04:00
Brad Linden 673b3309dd Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-10-25 16:12:13 -07:00
Andrey Lihatskiy 4c6ae49c88 Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts:
#	autobuild.xml
#	indra/llcommon/tests/llleap_test.cpp
#	indra/newview/viewer_manifest.py
2023-10-25 21:28:26 +03:00
Nat Goodspeed 56911455e0 SL-18837: Update dullahan to v118.0.5993.54
This includes this week's CEF 118.
2023-10-13 09:32:53 -04:00
Nat Goodspeed be5a6e6179 SL-18837: Update openal to v1.23.1-18e315c 2023-10-12 13:32:50 -04:00
Nat Goodspeed 787ca67b5f SL-18837: Update llca to v202310121525.0-d22bd98 2023-10-12 11:32:25 -04:00
Andrey Lihatskiy 067f3790da SL-18943 Update LLCA to 202310110702.0 2023-10-11 10:27:39 +03:00
Andrey Lihatskiy 660a9a3385 SL-18943 Update LLCA to 202310110655.0 2023-10-11 09:57:57 +03:00
Andrey Lihatskiy 9415d45848 DRTVWR-587 Update viewer-manager to 3.0-f48e635 2023-10-10 22:51:16 +03:00
Nat Goodspeed 6d3fa5f13f SL-18837: Update Tracy to 0.8.1-235e98f 2023-10-06 12:25:13 -04:00
Nat Goodspeed 909371d080 SL-18837: Remove 32-bit Windows package entries.
glext, which contains only header files, now builds only a single common
package instead of platform-specific ones. But as long as we retain the
platform-specific URLs, autobuild will continue to prefer those over the
common platform. Remove all platform-specific glext package entries.
2023-10-06 11:52:42 -04:00
Nat Goodspeed 093b6a1494 SL-18837: Update to Dullahan 1.14.0 with CEF 117 2023-10-06 06:55:34 -04:00
Nat Goodspeed b8e6777439 SL-18837: Merge branch 'main' into actions 2023-09-07 11:15:56 -04:00
Andrey Lihatskiy 147def0fdb SL-20130 Update viewer-manager (win64) to build 3.0-83fb46a 2023-08-28 20:40:30 +03:00
Andrey Lihatskiy dc384d6046 SL-20130 Update viewer-manager to build 3.0-83fb46a 2023-08-28 20:21:11 +03:00
Andrey Kleshchev 7373fd91fa Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llmath/llvolume.cpp
#	indra/llrender/llgl.cpp
#	indra/llxml/llcontrol.cpp
#	indra/newview/llpanelnearbymedia.cpp
#	indra/newview/llsceneview.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-24 01:23:52 +03:00
Brad Linden c6d5f11f63 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-08-23 12:26:14 -07:00
Andrey Lihatskiy ab000b4dce SL-16671 Add "Bellisseria" to the viewer dictionary 2023-08-03 01:13:29 +03:00
Andrey Lihatskiy c704a5fb62 DRTVWR-582 Update llca to build 202305160024.0 2023-08-02 15:00:13 +03:00
Nat Goodspeed 1f615e78b8 SL-20031: Update to viewer-manager 3.0-bd3aec2.
This one includes the fix for SL-19756.
2023-07-28 11:04:01 +03:00
Nat Goodspeed f6505f5a40 SL-20031: Update viewer-manager to 3.0-5cfc07c.
This version eliminates references to the Windows wmic command, calling the
WMI API instead.
2023-07-28 11:04:01 +03:00
Nat Goodspeed 248f78b45e SL-19854: Update bugsplat to release v1.0.7-527603a. 2023-07-21 10:24:46 -04:00
Nat Goodspeed bbb192eb79 SL-19854: Update bugsplat to release v1.0.7.86a960a. 2023-07-18 16:26:28 -04:00
Nat Goodspeed 6f1e7d58e3 SL-18837: Update llphysicsextensions_source to release v1.0.c93156d. 2023-07-14 10:17:13 -04:00
Nat Goodspeed 41a738591e SL-18837: Update apr_suite to release v1.7.2-e935465. 2023-07-10 13:21:02 -04:00
Andrey Lihatskiy 411aa59734 SL-19756 Update viewer-manager to 3.0.580913 2023-07-07 06:36:15 +03:00
Nat Goodspeed 726851b039 DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
to resolve conflicts in installer_template.nsi
2023-06-28 11:02:11 -04:00
Brad Linden 3ffa57473d Revert "SL-18837: On Windows, try using py.exe Python stub."
This reverts commit 996ea03d87.
2023-06-07 14:48:24 -07:00
Nat Goodspeed 996ea03d87 SL-18837: On Windows, try using py.exe Python stub. 2023-06-07 09:31:10 -04:00
Nat Goodspeed 6503c0b2b8 SL-18837: Update apr_suite to release v1.7.2-4d6fcb2. 2023-06-05 10:53:14 -04:00
Nat Goodspeed 659af42ff8 SL-18837: Update apr_suite to release v1.7.2-fb873f5. 2023-06-02 16:05:36 -04:00
Nat Goodspeed 1d43352652 SL-18837: Update libxml2, minizip-ng, colladadom
Update libxml2 to release v2.9.4.7476681.
Update minizip-ng to release v3.0.2.3e9876e.
Update colladadom to release v2.3.d1ef72a.
2023-06-02 13:18:35 -04:00
Callum Prentice 886c608967 DRTVWR-489: Incorporate new 3p libs for Collada and NanoSVG that have both been built after merging with master (and VS 2022 for Collada DOM). 2023-05-30 16:14:45 -07:00
Callum Prentice 7feba33415 DRTVWR-489: Update NanoSVG build to keep readiness report happier. Remove reference to Linux version of ColladaDOM - out of date, we don't have a newer build and it's making the Readiness Report sad. 2023-05-25 10:33:45 -07:00
Callum Prentice b6d4a373a4 DRTVWR-489: Trying to determine why the DRTVWR Readiness Report gets sad about the NanoSVG package - I didn't think it's analysis applied to Linux 3p packages but maybe it does 2023-05-24 11:58:00 -07:00
Callum Prentice fbccf6119d DRTVWR-489: Pull in a new build of 3p-colladadom that has the same version for all 3 platforms/bit widths (580295) - previously, the macOS version was different and the DRTVWR Readiness Script got sad about it 2023-05-23 11:11:13 -07:00
Nat Goodspeed 3ff43893da SL-18837: Update boost, googlemock
Update boost to release v1.81-90bb2df.
Update googlemock to release v1.7.0.77bba00.
2023-05-19 17:08:35 -04:00
Nat Goodspeed ff995bbba4 SL-18837: Next batch of GitHub actions build updates 2023-05-19 15:08:23 -04:00
Callum Prentice f45e888c90 Some small tweaks after merge with Viewer release 2023-05-17 11:31:45 -07:00
Brad Linden 2f44377b3e Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-05-17 11:17:48 -07:00
Brad Linden 7c1ccdc9a4
Merge pull request #179 from secondlife/brad/mac-nightly-builds
enable github actions mac nightly builds
2023-05-04 11:49:33 -07:00
Brad Linden 52f8ff9961 Merge remote-tracking branch 'origin/SL-19594-restore' into DRTVWR-559 2023-05-04 11:38:52 -07:00
Nat Goodspeed 1910eb6ae6 SL-19594: Update to bugsplat build 579669 2023-05-04 09:34:37 -04:00
Brad Linden e41cb7b5db Further attempts to get actions based nightly mac builds working for DRTVWR-559 2023-05-03 15:23:32 -07:00
Brad Linden f5cf0cf876
Update glext package in attempt to fix DRTVWR-559 viewer readiness report errors (#194) 2023-04-28 09:46:41 -07:00