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
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
e3f3eea825
DRTVWR-559: Add <unordered_map> header since we use it.
2023-05-04 10:21:28 -04:00
1910eb6ae6
SL-19594: Update to bugsplat build 579669
2023-05-04 09:34:37 -04:00
a57013082d
DRTVWR-559: Merge 'DRTVWR-559' into DRTVWR-559-zapfunc
2023-05-04 09:01:22 -04:00
7d23f91b16
Added ability to disable required OSX_SYSROOT cmake checks
2023-05-03 15:47:19 -07:00
a9dca45773
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
2023-05-03 17:31:24 -05:00
1cadfd44fe
DRTVWR-559 WIP - optimize ARC calculation et al.
2023-05-03 17:30:02 -05:00
e41cb7b5db
Further attempts to get actions based nightly mac builds working for DRTVWR-559
2023-05-03 15:23:32 -07:00
9096c8d06f
Experiment with turning on MacOS builds for github based nightly builds for DRTVWR-559
2023-05-03 14:59:53 -07:00
e7c5b9fb0f
SL-19647: Eliminate LLSDArray entirely.
...
Newer C++ compilers have different semantics around LLSDArray's special copy
constructor, which was essential to proper LLSD nesting. In short, we can no
longer trust LLSDArray to behave correctly. Now that we have variadic
functions, get rid of LLSDArray and replace every reference with llsd::array().
2023-05-03 17:38:30 -04:00
b985a69968
Merge pull request #191 from secondlife/brad/SL-19648-refcount-llgltfmaterial-thread-safety
...
Fix SL-19675 crash due to thread unsafe LLRefCount usage possibly related to SL-19648
2023-05-03 14:16:34 -07:00
5465594a34
Cleanup with SL-19675 fix. lifted empty check outside the workqueue post and cleaned up indentation
2023-05-03 13:30:33 -07:00
6a812fa1ba
Improved fix for SL-19675 crash. How about just don't refer to data when you don't need it
2023-05-03 13:30:33 -07:00
799d7605a9
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-03 12:31:25 -07:00
3c77c1b90f
DRTVWR-575: Replace some LLSDArray() usage with llsd::array().
...
It seems newer compilers have a different interpretation of exactly when to
engage LLSDArray's copy constructor. In particular, this assignment:
some_LLSD_map[key] = LLSDArray(...)(...)...;
used to convert the LLSDArray object directly to LLSD; now it first calls the
custom copy constructor, which embeds the intended array within an outer array
before assigning it into the containing map.
The newer llsd::array() function avoids that problem because what it returns
is already an LLSD object.
Taking inventory of LLSDArray assignments of that form turned up a number of
workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is
both simpler and more readable.
Tip of the hat to Chorazinallen for surfacing this issue!
(cherry picked from commit bb718155bd
2023-05-03 12:31:42 -04:00
21ddaa6908
DRTVWR-559: Merge remote branch 'DRTVWR-559' into DRTVWR-559-zapfunc
...
Delete the debugLoggingEnabled() (changed to LL_DEBUGS()) stanzas deleted by
the upstream.
2023-05-03 10:01:39 -04:00
2a10bd406c
DRTVWR-559: Replace debugLoggingEnabled() function with LL_DEBUGS().
...
The trouble with debugLoggingEnabled() is that it locked mutexes and searched
maps every time that call was reached. LL_DEBUGS() has the same functionality
(albeit with idiosyncratic syntax) but performs expensive lookups only once
per session, caching the result in a local static variable.
2023-05-03 09:55:31 -04:00
b318e24f25
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llglslshader.cpp
# indra/newview/lldrawable.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-05-03 14:59:31 +02:00
abc44d584e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-05-03 14:14:14 +02:00
1ecba4cc3c
Update German translation
2023-05-03 10:52:49 +02:00
e09475713b
DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU timer without a frame stall.
2023-05-02 18:47:21 -05:00
3513f67d2c
Attempt at fixing thread safety possibly related to SL-19648
2023-05-02 15:57:49 -07:00
d64a16aef8
Add button to select all faces with the same texture / normal map / specular map
2023-05-03 00:02:08 +02:00
a651642e6a
Linux: Build fix
2023-05-02 19:38:39 +02:00
181ddc6776
Updated Polish translation, minor adjustments in English one
2023-05-02 19:07:15 +02:00
bbfe4a2534
Merge branch 'main' of https://github.com/secondlife/viewer
2023-05-02 17:13:48 +02:00
f7dda591ba
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 17:13:36 +02:00
7ed52090a6
Increment viewer version to 6.6.12
...
following promotion of DRTVWR-539
2023-05-02 10:24:54 -04:00
e6ec5ccb2e
Remove "experimental" label
2023-05-02 13:43:23 +02:00
744f45c79e
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewerobject.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llworld.cpp
# indra/newview/llworld.h
2023-05-02 13:41:13 +02:00
4cba6ee94a
Of course it got screwed up...
2023-05-02 13:39:09 +02:00
7c3a8c2a9f
Update German translation
2023-05-02 13:30:33 +02:00
d32853dbef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 10:45:50 +02:00
2994833e7c
SL-19656 followup removing unused variable
2023-05-01 17:24:07 -07:00
334d71e910
SL-19656 Rewrite avatar and attachment render metrics to not interfere with render pipe and be representative of actual render cost instead of driver synchronization time.
...
* SL-19656 Rewrite avatar and attachment render metrics to not interfere with render pipe and be representative of actual render cost instead of driver synchronization time.
* SL-19656 Remove now dead code (trackAttachments et al).
* SL-19656 Fix for crash on GL <= 3.2
2023-05-01 17:05:09 -05:00
ed07f51839
Don't create Python byte code and __pycache__ directory
2023-05-01 18:02:38 +02:00
a9ef72eb55
FIRE-32915 Russian translation update, by Romka Swallowtail
2023-05-01 14:39:58 +02:00
0ecac64c2a
Delete orphaned files
2023-05-01 13:36:52 +02:00
59507ebd7f
Fix a bunch of warnings related to profiles
2023-05-01 13:35:40 +02:00
f124c62784
Add missing German translations
2023-05-01 12:41:50 +02:00
b8cb3845dd
FIRE-32913 - fix crash when image to be uploaded is invalid in some way
2023-05-01 02:52:57 +02:00
14e92f6b0d
missing format string
2023-05-01 00:12:03 +01:00
Ansariel