cc04903379
Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging
2022-04-28 14:05:49 -07:00
c9ef206e39
Beginning viewer side work for SL-17198 new asset and inventory types for Materials
2022-04-28 13:08:37 -07:00
b08742d0b3
Add a (broken) material upload handler fxn
2022-04-28 11:53:43 -06:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
900c13d361
SL-16892 Fix incorrect width of dropdown menus
2022-02-22 00:05:38 +02:00
b70614bd87
SL-16606: Add profiler category UI
2022-01-14 11:50:21 -08:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
747dbb7da2
Merge branch 'master' into DRTVWR-540-maint
2021-12-26 14:01:06 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
d71e0a6d47
SL-16094, SL-16400: Merge branch 'DRTVWR-546' into glthread
2021-11-23 21:23:45 -05:00
106d52c6ee
SL-16202: Instantiate LLSimpleton::sInstance generically
...
instead of requiring a separate declaration for each subclass.
The previous way produces errors in clang.
(cherry picked from commit 8458ad8890
2021-11-19 14:53:12 -05:00
730b8427b5
SL-16329 - track frame time and jitter (as average deviation frame to frame) in stats window
2021-11-19 14:43:19 -05:00
bbf3f516bd
SL-16094: Only link IMM32.LIB for llurlentry tests on Windows.
2021-11-19 14:43:19 -05:00
49dd88e86c
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
2021-11-19 04:45:15 +02:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
f9373a9b4e
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +02:00
029b41c041
Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"
...
This reverts commit 5188a26a85819088563e
2021-11-15 09:25:35 -07:00
5188a26a85
SL-16220: Merge branch 'origin/DRTVWR-546' into glthread
2021-11-12 12:10:44 -05:00
69a39dce0b
SL-16094: Only link IMM32.LIB for llurlentry tests on Windows.
2021-11-10 11:11:04 -05:00
214d8d40c1
SL-16094: Statically link to Windows IMM32.LIB.
...
llwindowwin32.cpp's LLWinImm class used to dynamically load IMM32.DLL and
populate its methods using GetProcAddress(). That was to support Windows XP.
Since we've dropped Windows XP, use static linking instead, with dramatically
fewer lines of code (and less of a thread safety alarm trigger).
We retain the LLWinImm wrapper class only as a hook for Tracy instrumentation.
2021-11-10 10:17:12 -05:00
ca0b9a3753
SL-16329 - track frame time and jitter (as average deviation frame to frame) in stats window
2021-11-09 20:25:25 +00:00
8458ad8890
SL-16202: Instantiate LLSimpleton::sInstance generically
...
instead of requiring a separate declaration for each subclass.
The previous way produces errors in clang.
2021-11-04 16:40:05 -04:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
f2eba1909d
SL-16234 FIXED Frame stall caused by unnecessary building the floater when exiting viewer
2021-10-22 16:09:41 +03:00
b41f6cd2b5
SL-15387 Resolve some columns crashes
...
Looks like mColumnsIndexed had dead pointers which resulted in a crash and there is some kind of hard to trigger interaction with searchable UI
2021-10-22 00:01:05 +03:00
bdb4a90e7c
SL-16157 Crash at LLFontGL::maxDrawableChars
2021-10-08 02:12:36 +03:00
2cb09dd4a8
SL-16024: Return shared_ptr from LLInstanceTracker::getInstance().
...
It feels wrong to return a dumb LLInstanceTracker subclass* from getInstance()
when we use std::shared_ptr and std::weak_ptr internally. But tweak consumers
to use 'auto' or LLInstanceTracker::ptr_t in case we later revisit this
decision.
We did add a couple get() calls where it's important to obtain a dumb pointer.
2021-10-07 11:53:45 -04:00
adcd08fbf4
Revert "Merge branch 'c++17' into DRTVWR-522-maint"
...
This reverts commit 203ea3a70a8e3f077886
2021-09-28 19:22:18 +03:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
203ea3a70a
Merge branch 'c++17' into DRTVWR-522-maint
2021-08-27 19:24:05 +03:00
01be43b7cd
SL-15426 FIXED Tear off menu visible during logout
2021-08-03 17:27:53 +03:00
8178e51a74
SL-15690 FIXED Wrong URI determination
2021-07-29 19:06:13 +03:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
3e85f6a8c9
Merge branch 'master' into DRTVWR-540-maint
2021-07-19 22:22:58 +03:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
9873e7bba9
Merge branch 'master' into DRTVWR-527-maint
2021-07-19 22:22:32 +03:00
2ded530f93
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
7a6b5a5984
SL-15383 Fix combobox's search highlights
2021-07-01 23:02:34 +03:00
2e790e9b72
DRTVWR-538: Merge branch 'master' into c++17
2021-06-29 10:48:02 -04:00
5aec46243b
Merge branch 'master' into DRTVWR-540-maint
2021-06-25 01:02:22 +03:00
8b5fe507a4
Merge branch 'master' into DRTVWR-530-maint
2021-06-25 01:02:15 +03:00
0ca16a1f95
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# indra/newview/llinventorypanel.cpp
2021-06-25 01:02:04 +03:00
7f19c512c9
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2021-06-25 00:54:35 +03:00
Brad Kittenbrink