4d0ebf6143
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewerdisplay.cpp
2023-05-17 18:02:50 +02:00
faa9ffe2b8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-17 17:21:57 +02:00
4758355c59
Fix crash during avatar profile callback ( #218 )
2023-05-17 09:05:36 -05:00
ee0b330b2d
DRTVWR-559 Decruft deprecated OpenGL flags.
2023-05-16 20:31:29 -05:00
a256a18884
SL-19674 Disable "Blinn-Phong" when a PBR material is applied to make it clear that those buttons are inoperable until you remove the PBR material.
2023-05-15 13:49:20 -05:00
cdc9852f05
SL-19709 Fix for fullbright shiny not factoring out exposure and flickering fullbright alpha. Incidental decruft.
2023-05-15 11:01:24 -05:00
9f1489a794
Don't strip the leading md5sum char unless its a '\'
2023-05-15 00:27:08 +01:00
615055e6d0
oops don't need both.
2023-05-15 00:23:16 +01:00
37c642cc81
FIRE-32941 Russian translation update, by Romka Swallowtail
2023-05-14 20:35:05 +02:00
e3f9244375
SL-19710 Fix for deadlock in LLPerfStats. Move General thread initialization to earlier in session (unrelated).
2023-05-12 18:09:35 -05:00
8e9b3a8f37
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/pipeline.cpp
2023-05-12 12:06:57 +02:00
06bdee6634
Xcode build fixes for DRTVWR-559
2023-05-11 12:18:45 -07:00
3914c4ce16
Merge pull request #212 from secondlife/SL-19236
...
SL-19236: Fix HUDs not rendering when transparent water graphics setting is off
2023-05-11 11:39:04 -07:00
7d0903533c
SL-19236: Fix HUDs not rendering when transparent water graphics setting is off
2023-05-11 11:31:09 -07:00
b8575bd1bd
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
2023-05-11 13:21:00 -05:00
8077d33ba0
SL-19656 Remove LLPerfStats thread and fold into General thread. Hook avatar GPU time into LLPerfStats. Incidental decruft.
2023-05-11 13:20:34 -05:00
69d444826d
Merge pull request #208 from secondlife/SL-19690
...
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
2023-05-10 09:14:14 -04:00
ab77545717
FIX Opensim VarRregions with non-power of 2 sizes flood logs
2023-05-09 16:31:06 +01:00
0b1c0aa242
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
2023-05-08 15:21:23 -05:00
3f1f126186
DRTVWR-559 Remove main window proc printf debugging.
2023-05-08 15:21:04 -05:00
06be53fef7
Merge pull request #206 from secondlife/SL-19644
...
SL-19644: De-virtualize pushBatch
2023-05-08 11:05:24 -07:00
f728808d93
SL-19690: Fix a lingering reference to WorkSchedule::postIfOpen()
2023-05-08 12:45:27 -04:00
d75ecde69c
SL-19690: Properly qualify exception type.
2023-05-08 12:31:57 -04:00
026ef1935d
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
...
Rather than continuing to propagate try/catch (Closed)
(aka LLThreadSafeQueueInterrupt) constructs through the code base, make
WorkQueueBase::post() return bool indicating success (i.e. ! isClosed()).
This obviates postIfOpen(), which no one was using anyway.
In effect, postIfOpen() is renamed post(), bypassing the exception when
isClosed().
Review existing try/catch blocks of that sort, changing to test for post()
returning false.
2023-05-08 12:07:31 -04:00
6d0d9b8e54
SL-19690 Updated contribution doc
2023-05-08 18:28:33 +03:00
db30ffc7cb
SL-19690 Merge pull request #207 from RyeMutt/shutdown-crash
...
Fix exceptions during shutdown causing early program termination
2023-05-08 18:25:12 +03:00
f306e72503
Fix button widths for texture preview in German translation
2023-05-08 15:27:41 +02:00
f921c7e0af
FIRE-32930 Russian translation update, by Romka Swallowtail
2023-05-06 22:42:23 +02:00
3ef1ac290c
FIRE-32921 Updated French (by Laurent Bechir) and Polish translations
2023-05-06 19:32:43 +02:00
855cae27cc
Fix LLThreadSafeQueueInterrupt in WorkQueueBase::postTo during shutdown by catching and returning false
2023-05-05 17:23:29 -04:00
6954aafb5d
Fix uncaught LLThreadSafeQueueInterrupt during ImageWorker threadpool shutdown
2023-05-05 17:20:48 -04:00
307d31116d
SL-19644: De-virtualize pushBatch
...
Bump still uses its own pushBumpBatch function - OK, works the same as
before.
2023-05-05 11:32:56 -07:00
5ce70325ce
DRTVWR-559: Hard tabs considered harmful
2023-05-05 09:52:22 -04:00
356291f57b
Restore this...
2023-05-05 12:45:26 +02:00
9057bfc995
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llcallstack.h
# indra/llinventory/llsettingssky.cpp
# indra/llmath/llvolume.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llviewerstats.cpp
# indra/newview/llvoavatar.cpp
2023-05-05 12:35:33 +02:00
3b7b1c89a8
Make Nightly builds expire after 14 days
2023-05-05 00:39:09 +01:00
b35fed42a2
remove pesky extra slash
2023-05-05 00:15:47 +01:00
572d313bcf
DRTVWR-559 LLSD array build fix
2023-05-04 23:06:00 +03:00
f8f119e4a8
SL-18932 Canceling material selection only reverts override
2023-05-04 22:46:39 +03:00
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
a22d62e8ed
Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-559
2023-05-04 11:39:03 -07:00
52f8ff9961
Merge remote-tracking branch 'origin/SL-19594-restore' into DRTVWR-559
2023-05-04 11:38:52 -07:00
c75b0079d9
Fix typo
2023-05-04 11:28:29 -07:00
66413dfa38
Merge pull request #203 from secondlife/DRTVWR-559-zapfunc
...
DRTVWR-559: Replace debugLoggingEnabled() function with LL_DEBUGS().
2023-05-04 13:39:59 -04:00
13d372adea
Switch mac build to go on hosted macos-12-xl runner.
2023-05-04 10:26:18 -07:00
8874367f92
Move to MacOs11 as GitHub have stopped all the builds on 10.15
2023-05-04 18:09:07 +01:00
d5c5423422
Merge remote-tracking branch 'origin/master'
2023-05-04 18:08:15 +01:00
16e7e999cf
FIRE-32926 - Profile notes that are actively being edited get discarded when the profile owner enters or leaves the region at the same time.
2023-05-04 18:22:09 +02:00
e3f3eea825
DRTVWR-559: Add <unordered_map> header since we use it.
2023-05-04 10:21:28 -04:00
1f3f7f58cc
Support separate webhooks by release type
2023-05-04 14:53:24 +01:00
Ansariel