89b5410d0c
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llprofilercategories.h
# indra/llwebrtc/llwebrtc.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llimview.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2024-04-16 12:53:16 +02:00
0cf61eed93
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicevivox.cpp
2024-04-16 11:41:43 +02:00
7cc907fb14
Update German translation
2024-04-15 18:42:33 +02:00
240f807ed1
new texture panel: fix default and blank texture entries for texture swatches
2024-04-15 16:38:58 +02:00
fa6ce3f60a
new texture panel: add U/V and H/V labels to texture transforms
2024-04-15 16:01:29 +02:00
e61942f3d6
Minor changes across various translations
2024-04-14 21:09:24 +02:00
92e4539638
Updated Polish translation
...
With exception of panel_fs_tools_texture.xml as it has pending changes
2024-04-14 21:08:49 +02:00
0bacc8d3dd
REvert string name to azure_links_text, as google_links_text already exists, for all affected translations
2024-04-14 19:49:03 +02:00
c1fe6d41ba
Tiny fix for stat bar name
2024-04-14 01:15:53 +02:00
33c4c3a703
Normalize the setting names to have FS prefixes+tweak defaults
2024-04-13 21:53:45 +01:00
828fda9401
Merge branch 'ShowBlinnPhongFallbackInEdit'
2024-04-13 18:56:28 +01:00
a0271ef772
Changes to support applying textures to BlinnPhong when PBR exists
...
We need to inject a flag from the tools floater that reaches the dragdrop tooling overriding the behaviour that by-default applies the texture to the color channel on the PBR mat. This is minimal code but rather horrible for maintenance, suggestions of better options are welcome.
2024-04-13 18:55:39 +01:00
e1665ddb4b
remove conditional enabling, we want to be able to add fallbacks
2024-04-13 18:20:30 +01:00
ab2a74bb2d
update call to selectionSetImage with optional boolean "isPBR"
...
This is keyhole surgery, we inject isPBR into selectionMgr so that it can use use a slightly different apply functor when it passes off to dragdrop controller. Nasty, but for now the least intrusive change.
2024-04-13 17:53:38 +01:00
5372dfc795
Tab change handler to trigger the rendering flips.
2024-04-13 17:46:45 +01:00
aadcf79cd9
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-13 04:35:18 +02:00
eafe4354a2
Small fix for beacons label for all affected langauges
2024-04-12 21:26:47 +02:00
274a0cdb6a
another override point
2024-04-10 21:03:58 +01:00
2e6884950e
Allow creators to see the BlinnPhong Fallback while they are editing even if PBR exists
2024-04-10 21:03:37 +01:00
6fa8286235
Merge branch 'master' into new_texture_edit_panel
2024-04-10 19:59:10 +01:00
f871c770d4
Fix the build
2024-04-10 05:29:35 +00:00
d7b933fa0c
Merge branch 'main' of https://github.com/secondlife/viewer
2024-04-10 00:15:29 +02:00
da9a1dcb55
Increment viewer version to 7.1.6
...
following promotion of secondlife/viewer #690
2024-04-09 17:14:13 -04:00
bc2b88be93
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-09 19:46:31 +02:00
75a9ed38c0
Merge pull request #1164 from secondlife/roxie/webrtc-voice
2024-04-09 07:33:13 -07:00
b425165add
Merge branch 'roxie/webrtc-voice' of https://github.com/secondlife/viewer into roxie/webrtc-voice
2024-04-08 21:30:36 -07:00
39cb0bca32
Show mute/unmute status in group voice
2024-04-08 21:29:12 -07:00
896b7f69d1
Fix whitespace accident
2024-04-08 15:42:15 +02:00
a436595d31
Merge new texture edit panel up to current master
2024-04-08 15:38:34 +02:00
f2ec9e5cca
Merge pull request #1150 from secondlife/roxie/webrtc-voice
2024-04-08 04:10:34 -07:00
648741470f
CR suggestions
2024-04-07 19:23:00 -07:00
278f9f13b5
Add a category to plist.
2024-04-08 02:02:14 +01:00
ca9ab7b17d
Merge branch 'master' into new_texture_edit_panel
2024-04-07 22:16:35 +01:00
4be63d8c1f
missed a file
2024-04-07 14:16:07 -07:00
34ed990fa3
Show 'decline' when peer declines p2p voice
...
The simulator will send a chatterbox notification that
voice is no longer in use for a given channel, and
the viewer should take that as a case where the peer
does not want voice, hence it's a decline.
2024-04-07 14:13:00 -07:00
0d5b6c621c
Merge branch 'fix-gltf-broken-cache'
2024-04-07 19:57:12 +01:00
94c02c2498
FIRE-33808 - vocache extras rework
...
Add more logging
trigger overwrite by making dirty to self-heal when main cache is corrupted on read
Add support for kill and similar unimplemented functions.
Add UUID when missing (via fullCacheUpdate)
2024-04-07 19:55:29 +01:00
e3ba511f7a
Place Pork in the proper place. Remove the extra Beq
2024-04-07 16:09:41 +01:00
4ecf050439
Tell the user the peer has declined and shut down voice channel
...
When the server sends up a notification that a peer is not doing
voice in adhoc-style p2p chat, shut down the voice call and
notify the user the peer has declined.
2024-04-06 21:58:17 -07:00
06c8475d74
Linux: Remove obsolete gstreamer 0.10 3p package (superseded by existing gstreamer 1.x package), replace 3p dependency for icu4c and fltk with LL provided versions.
2024-04-06 06:01:37 +00:00
eb863e8440
Merge Apple notarisation fixes
...
This is still not ideal the logic to detect a successful submit appears broken so is currently disabled.
2024-04-05 13:34:18 +01:00
b6f4cec7d5
checkpoint p2p im decline/accept work
2024-04-04 16:13:33 -07:00
c2a04568b9
Merge branch 'roxie/webrtc-voice' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-04-04 11:35:19 -07:00
3ff1f0f951
An explicit "decline" message for P2P
...
When declining a P2P voice call for webrtc, instead of relying
on vivox to stop "ringing," we need to send an explicit decline
message from the peer through the server infrastructure.
2024-04-04 11:32:51 -07:00
fda3fefa7f
Notarizing OK - So let's staple the app.
2024-04-03 22:26:08 +01:00
fb4c15ce07
Turns out ASC_PROVIDER is team-id, who knew.
2024-04-03 19:15:15 +01:00
230e5a14a5
Merge branch 'master' into 7.1.5_1st_preview
2024-04-03 19:14:34 +01:00
2ede54934e
Merge pull request #17 'fix-linux-volume-catcher' from Makidoll
2024-04-03 18:14:28 +01:00
847250a885
Tag and credit Makidoll for PR#17
2024-04-03 18:12:32 +01:00
f05d34ee5a
Merge pull request #18 from FirestormViewer/dependabot/github_actions/actions/setup-python-5
...
Bump actions/setup-python from 4 to 5
2024-04-03 17:25:27 +01:00
Ansariel