cd4883fccc
Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/xui/en/strings.xml
2024-01-09 11:30:13 +01:00
10f5b990d3
Merge branch 'main' of https://github.com/secondlife/viewer
2024-01-08 20:36:50 +01:00
725f7b747a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
2024-01-08 20:34:32 +01:00
8d16d6e620
Merge remote-tracking branch 'origin/main' into DRTVWR-601
2024-01-08 11:30:56 -08:00
77395eddc9
Increment viewer version to 7.1.3
...
following promotion of DRTVWR-596
2024-01-08 14:22:05 -05:00
823addfdc0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/vjlocalmeshimportdae.cpp
2024-01-08 20:19:30 +01:00
7a0168c931
Add texture cache monitor to the texture view
...
shows used vs max.
2024-01-07 21:07:51 +00:00
cfcbd6fc54
Linux: selectively disable a few compiler warnings that are most likely bogus
2024-01-07 18:45:08 +01:00
084ee08f9b
Fix some more...
2024-01-07 16:46:15 +01:00
2737820ca8
Fix some...
2024-01-07 16:34:14 +01:00
4392f1bc8f
SL-20748 Fix library materials not being previewable on an object
2024-01-05 20:03:14 +02:00
a8f43fd40b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-01-05 13:17:23 +01:00
8d59c0b1a3
Add readme file
2024-01-02 17:38:47 +01:00
5e759054ca
FIRE-33578: Reset defaults doesn't reset materials upload folder
2024-01-01 16:22:15 +01:00
0e154e344e
It's 2024... basically... almost...
2023-12-31 14:06:25 +01:00
9d40b25f1a
Merge branch 'master' of github.com:FirestormViewer/phoenix-firestorm-ll-master
...
Merge vcs changes to github
2023-12-29 23:41:04 +01:00
869c8d1882
Add label / caption color support to texture picker, fix label width setting and remember to also add the required parameters to the skin
2023-12-29 20:32:28 +01:00
d75ba744a8
Also add the required parameters to the skin ...
2023-12-29 20:29:58 +01:00
8776d50ef4
Add label / caption color support to color swatches
2023-12-29 20:28:05 +01:00
fdeddfcdf2
Remove unnecessary include
2023-12-29 20:21:58 +01:00
485e9701b8
Remove unnecessary include and class forward declaration
2023-12-29 20:18:32 +01:00
6eef91e095
Fix wrong include
2023-12-29 20:16:39 +01:00
99851ed459
disable viewer_version extraction rule for now
2023-12-29 14:41:12 +00:00
5aa47877a2
Export python binary in ENV to satisfy CMake
...
Use env var to force the python version
set python for Cmake and remove python cache
2023-12-29 02:35:34 +00:00
549e7ff3c1
ensure python & python3 have the same requirements set
2023-12-29 02:34:56 +00:00
88a005a268
use latest autobuild and llsd/llbase
2023-12-29 02:34:45 +00:00
5198af498a
switch windows python back to defaults
2023-12-29 02:34:35 +00:00
b6d55cc43b
quick patch - not a fix, these will not run
...
clean up variable declarations and prep for bugsplat sym upload
bash variables hate whitespace
2023-12-29 02:34:09 +00:00
386c589885
Merge branch 'fixpythonweridness'
2023-12-29 02:30:05 +00:00
7db1a5ce49
fail means fail
2023-12-27 19:12:38 +00:00
68ef687727
Crap! Somebody noticed...
2023-12-27 19:21:19 +01:00
f3b589705b
Update German translation
2023-12-27 19:03:43 +01:00
d21a733858
Remove Meshes from inventory filter dropdown as raw mesh assets are not exposed to the user
2023-12-27 18:47:17 +01:00
a26a2cc3f5
Add Materials to inventory filter dropdown
2023-12-27 18:32:06 +01:00
b4104adf09
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-12-26 14:21:18 +01:00
e799a64153
SL-20696 FIXED llLoopSoundSlave producing no sound since viewer update
2023-12-26 11:24:07 +01:00
4414b0f4e1
Fix dereferencing null pointer
2023-12-24 13:15:57 +01:00
7a1520b145
Merge branch 'localmeshfixes'
2023-12-23 18:27:39 +00:00
cd5c64a4be
FIX axis orientation not properly respected in local mesh
...
If no axis was specified the default (Y_UP) was "assumed" but the Y_UP to Z_UP transform not actually applied.
2023-12-23 18:07:32 +00:00
6e36f4eb93
looooaaaaaads of local mesh DAE loading debug
2023-12-23 18:07:32 +00:00
a619311e59
Local Mesh
...
"Skeleton" and "non-skeleton" based rigged-models are noth fully supported.
Lots of extra debug added for future investigations.
A number of other smaller bugs solved on the way.
2023-12-23 18:07:32 +00:00
7dec7094da
Fix not being able to rez a box on top of a prim when MaxSelectDistance is shorter than the surface distance, even though LimitSelectDistance is switched off.
2023-12-21 17:03:38 +01:00
d9de07bb1f
change da,pt,tr,zh stragglers to filter_panel too
2023-12-20 11:11:17 +00:00
481adadacb
Fix duplicate tag for inventory in en
2023-12-20 11:04:43 +00:00
4c63cdfb44
Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601
2023-12-19 15:36:53 -06:00
575dc8f410
SL-20754 Modify default midday to be a better approximation of Cloud Layers HDRI (addresses blue sheen).
2023-12-19 15:36:34 -06:00
f43e4c6253
SL-20611 Followup -- fix for water haze artifacts on fullbright objects above water.
2023-12-19 10:20:37 -06:00
3f74b107b3
FIRE-33532 Add the check for current PTT state in the mic toggle sound, in voice_follow_key
...
KEYSTATE_DOWN is called only once when using scroll wheel button, but if keybind is assigned to a keyboard key and the key is depressed, then it's called every frame. Simply check for the bool instead of playing around with KEYSTATE_LEVEL.
2023-12-17 18:17:49 +01:00
cdbcbf09e7
FIRE-33532 Cover the remaining cases for mic toggle: hotkey / mouse, activation/deactivation without PTT checkbox selected
2023-12-17 15:25:52 +01:00
0c1f2366ff
FIRE-33532: Fix voice PTT toggle sound playing when it should not
2023-12-17 14:13:07 +01:00
Ansariel