2db96d32b8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-30 21:12:29 +01:00
de0dd5a11b
FIRE-32474 Russian translation update, by Romka Swallowtail
2022-11-28 09:33:46 +01:00
69a31fad4c
[FIRE-32453] [BUG-232971] disconnect sooner to force the cache write
...
The call to forceQuit sets the viewer state to Quitting. This triggers all the thread pools to exit, and to do so with no sense of orderly closure.
As a result the main window can exit which removes any visual indication to the user that work is still happening.
When the user then restarts, issues are caused because of temporary files that may still be in use.
It is possible too that the early closure of the mainwindow, allows the OS to terminate the process without prompting the user for a safe shutdown (unproven)
2022-11-27 23:02:59 +00:00
026b8ff411
Update URL of message template
2022-11-21 20:40:50 +01:00
dbc70be7c4
Merge branch 'master' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
# autobuild.xml
2022-11-21 20:37:32 +01:00
b9b9fed37d
Remove TextureMemory from list of graphic preset controls
2022-11-21 13:31:06 +01:00
3eb4c129e3
Update German translation
2022-11-20 23:14:22 +01:00
d5298ac971
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-11-20 23:13:06 +01:00
7be4e2da47
FIRE-32446 French translation update, by Laurent Bechir
2022-11-20 22:34:00 +01:00
85fa900fa7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-20 21:51:53 +01:00
34d3f94db6
Fix for SSAO not behaving properly.
...
SL-18662
2022-11-20 11:09:05 +01:00
783926e124
Merge pull request #1 from FelixWolf/CZ-1
...
Various repo fixes
2022-11-18 14:22:49 -08:00
ee37ea4aa7
Renamed LICENSE.txt to follow naming scheme of other repos
2022-11-18 17:10:03 -05:00
ade79bc6f6
SL-18677 Disable materials UI when materials caps are not available
2022-11-18 21:15:54 +02:00
32663643c7
SL-18668 Only object id is strictly required
2022-11-18 20:00:10 +02:00
3368fe153e
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-18 11:45:29 -06:00
b1dabc0f00
SL-18669 Fix for broken lighting on transparent faces. Optimize handling of "bindDeferredShader" and shadow map setup.
2022-11-18 11:45:04 -06:00
f7f163f010
Merge pull request #3 from secondlife/signal/label
...
Add automatic PR labels
2022-11-18 08:42:14 -08:00
5c77f900ac
Merge pull request #2 from secondlife/signal/cla
...
Add CLA bot
2022-11-18 08:41:43 -08:00
e75104b066
Add automatic PR labels
2022-11-18 07:39:54 -08:00
eaf55065e2
Add CLA bot
2022-11-18 07:30:38 -08:00
7edf1ac66f
SL-18666 Allow tabbing between fields in Material editor floater
2022-11-18 16:27:19 +02:00
7889f0b170
SL-18668 Don't call makeMap from callback
2022-11-18 15:28:25 +02:00
14f34041b8
Add copy of license to root directory so it is recognized by gh
2022-11-18 06:24:43 -05:00
35d2771cd3
Fix spelling error on license file name
2022-11-18 06:23:11 -05:00
4a33a0edb2
Fix readme logo for dark theme sites
2022-11-18 06:22:43 -05:00
6de62442e7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-17 21:59:35 +01:00
d5ed58a70e
Fix line widths: line widths > 1.0 are deprecated in current core profile, but not invalid; checking valid range should be sufficient if line widths > 1.0 will ever get removed in a future OGL version
2022-11-17 21:59:22 +01:00
e2d1af5c4f
SL-18154 Profile guided optimizations -- remove some unneeded operations and make LLDrawPoolMaterials less branchy.
2022-11-17 13:35:39 -06:00
d539550252
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-16 16:07:58 -06:00
6387fbb378
SL-18648 Simplify permission testing
2022-11-16 23:56:06 +02:00
d934a14b97
Merged in SL-18632 (pull request #1199 )
...
SL-18632: Implement editing GLTF material texture transforms in build floater
2022-11-16 21:38:29 +00:00
d2b8d5b368
SL-17699 Fixed drag and drop into material picker
2022-11-16 23:37:48 +02:00
bfe5e3f289
SL-18648 Material editor should only allow full-perm textures
2022-11-16 23:23:43 +02:00
bc4694e82a
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-16 14:49:47 -06:00
8d2ac419b2
SL-18154 Profile guided optimizations vs release viewer. Trim some unused abilities and remove some more fast timers.
2022-11-16 14:49:17 -06:00
62aa0e807f
SL-18632: Un-hide planar align options when editing GLTF textures in build floater
2022-11-16 12:04:16 -08:00
e594db10c1
FIRE-32432 Russian translation update, by Romka Swallowtail (coalesced objects)
2022-11-16 20:40:13 +01:00
07ada65df1
A few tweaks to SSR while I'm in the neighborhood.
...
Mostly just making it actually kind of work. Still needs a lot more tweaking - but can revisit later.
SL-18332
2022-11-16 07:11:13 -08:00
ca3a61a828
Update German translation
2022-11-16 15:53:31 +01:00
b3eed96c20
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
# indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
# indra/newview/llpanelface.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewershadermgr.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-11-16 15:44:33 +01:00
3fce699639
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-16 14:07:33 +01:00
a96ed3097e
Revert "phototools2.1 integration" - needs more work and also causes merge conflicts somewhere else I'm not going to deal with multiple times
...
This reverts commit b213b4d4ae
2022-11-16 14:06:20 +01:00
986d5f44d4
Update German translation
2022-11-16 13:46:30 +01:00
fd76c195c8
SL-18632: Implement editing GLTF material texture transforms in build floater
2022-11-15 18:11:27 -08:00
911aba0c1c
SL-18458 VOCache cleanup region_handle message encoding.
...
Really wish there were a native way to send S64/U64 values in llsd.
2022-11-15 12:51:28 -08:00
cf96623c64
Updated Polish translation
2022-11-15 20:24:48 +01:00
a5df39feb1
FIRE-31369: Add inventory filter for coalesced objects
2022-11-15 19:01:46 +01:00
55103bff6d
Merge remote-tracking branch 'github/master'
2022-11-15 08:14:39 -08:00
3cc3e6a5e0
Merged in SL-18634 (pull request #1198 )
...
SL-18634: Fix GLTF material texture transform not serializing when texture ID is null
2022-11-14 23:06:44 +00:00
Ansariel