0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01: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
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
b2569a06e6
Windows; Update KDU to 8.2
2021-08-23 17:55:59 +02:00
20cd749175
Instrument threaded texture decode
...
includes fix for timeout in slow decoded bakes
2021-05-28 02:22:53 +01:00
fd19a25282
KDU 8.1 for macOS.
2021-04-03 10:20:57 -05:00
b25a3e5448
Correct KDU version check.
2021-03-28 14:09:39 +02:00
8387c0e6cf
Linux; KDU update
2021-03-23 17:47:31 +01:00
4a3d77033d
Move disabling of KDU-specific Clang warning to include_kdu_xxxx.h
2020-10-09 08:34:55 +02:00
ae9f77182b
Multi-threaded KDU works fine on Windows - re-enable it
2020-10-09 08:33:13 +02:00
2e179112c7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-01 09:46:00 +02:00
7e97addca3
Fix KDU image encoding for KDU >= 8.0.4
2020-07-28 18:35:38 +02:00
350cf703a1
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-24 00:44:20 +02:00
c16a364377
There was an idiom to test with LL_DARWIN if the compiler used is clang. This is not correct, as clang is available on all 3 platforms. The correct way to check for this is via __clang__ ( https://clang.llvm.org/docs/LanguageExtensions.html#builtin-macros )
2020-07-22 06:48:15 +03:00
f116ea4cb7
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
...
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
449f7fe8e8
Change #if LL_DARWIN to #if __clang__ as clang can be used on Linux too ...
2020-07-17 20:26:02 +02:00
d6baa7a853
DRTVWR-494: Put streaming operator<<() for kdu_dims in kdu_core.
...
It seems the lookup now requires that the operator<<() function be defined in
the same namespace as the argument.
2020-03-25 15:28:17 -04:00
a135b5b428
Merge remote-tracking branch 'origin/ll-vs2017' into fs-vs2017
2019-12-21 13:14:51 +01:00
5469b246d2
Compile time compatibility for KDU 8
2019-12-09 22:06:14 +01:00
65e00abe6f
DRTVWR-494: Put streaming operator<<() for kdu_dims in kdu_core.
...
It seems the lookup now requires that the operator<<() function be defined in
the same namespace as the argument.
2019-12-06 16:02:28 -05:00
987b890df8
KDU update.
2019-05-28 00:12:49 +02:00
ffc621be27
Merge viewer-cougar
2018-05-30 21:29:41 +02:00
f86073d609
Fix broken integration and unit tests.
...
Update KDU stubs in integration test.
Work around MAINT-8675 stale cert in llsechandler_basic for now.
Update stubs for LLTrans::getString in handful of integration tests.
2018-05-21 17:54:54 +01:00
b56c2a790e
Fix Windows build
2018-01-27 11:43:30 +01:00
2e644b4911
Compile fixes for Xcode 9 (and probably gcc).
2018-01-27 02:02:16 -06:00
127809e241
Merge with viewer64.
2017-04-10 15:15:11 +02:00
1771857e6c
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-03-06 14:27:29 -05:00
25cd2ed205
Merge
2017-01-25 11:13:59 -08:00
29543e2572
Remove obsolete code.
2017-01-11 02:24:51 +01:00
966c1f36c5
Fix compile error, KDU_X86_INTRINSICS was defined multiple times.
2017-01-11 00:33:20 +01:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
7b2cf53f78
Pull in new version of KDU third party package that is build (correctly) as a static library vs. a stub library/DLL
2016-11-30 12:21:05 -08:00
b9cc216b9c
DRTVWR-418: Have to #include "llkdumem.h" even when not LL_DARWIN.
2016-11-23 12:07:31 -05:00
b1185eca82
DRTVWR-418: Fix Windows line endings in include_kdu_xxxx.h
2016-11-17 08:59:01 -05:00
0413e40d82
DRTVWR-418: Update KDU and llimagej2ckdu* with certain clang fixes.
2016-11-03 20:48:41 -04:00
6cc4a8dcd2
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-11-03 09:31:15 -04:00
d7a0835432
Merge.
2016-09-26 21:12:34 +02:00
8d86f5a0c4
Merge
2016-09-16 16:00:07 -07:00
51236b7c9c
Merge
2016-09-14 09:55:18 -07:00
c7cb6636c4
MAINT-6584, MAINT-5011: Change new 'throw' to LLTHROW()
...
to be consistent with new exception conventions.
2016-09-07 10:57:07 -04:00
dd1a0218b1
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc
2016-09-07 10:46:28 -04:00
c2b88ca860
Build fix for KDU 7.5+
2016-08-29 21:30:03 +02:00
66aba60ce0
Build fix - now idea how this actually works at all for LL...
2016-08-29 13:01:43 +02:00
09b9913d35
Merge viewer-vob
2016-08-29 11:40:53 +02:00
0eac1f41f6
MAINT-5011: Catch kdu_exception (aka int) in case it leaks out.
...
KDU internally throws kdu_exception, which is a typedef for int. It's possible
that such an exception might leak out.
Our usual strategy for unknown exceptions is to catch (...) and let
boost::current_exception_diagnostic_information() handle them. However, for
int (or a class not derived from std::exception), that function will only
shrug and report no information available.
Besides, we want to format kdu_exception specially anyway. First, the KDU
#defines are in hex, so we should report the value in hex. But on inspection,
certain of those hex values are actually multibyte ASCII literals in disguise
-- so also report the byte string value.
2016-08-17 16:42:10 -04:00
83eb960063
MAINT-5011: Derive image-load exceptions from LLContinueError.
...
Failure to load an image shouldn't crash the whole viewer.
2016-08-17 15:47:08 -04:00
993f54f6e9
MAINT-5011: Try to enrich catch (...) logging throughout viewer.
...
Turns out we have a surprising number of catch (...) clauses in the viewer
code base. If all we currently do is
LL_ERRS() << "unknown exception" << LL_ENDL;
then call CRASH_ON_UNHANDLED_EXCEPTION() instead. If what we do is
LL_WARNS() << "unknown exception" << LL_ENDL;
then call LOG_UNHANDLED_EXCEPTION() instead.
Since many places need LOG_UNHANDLED_EXCEPTION() and nobody catches
LLContinueError yet, eliminate LLContinueError& parameter from
LOG_UNHANDLED_EXCEPTION(). This permits us to use the same log message as
CRASH_ON_UNHANDLED_EXCEPTION(), just with a different severity level.
Where a catch (...) clause actually provides contextual information, or makes
an error string, add boost::current_exception_diagnostic_information() to try
to figure out actual exception class and message.
2016-08-17 15:40:03 -04:00
db4f13e7bc
MAINT-5011: Clean up indentation from merge of viewer-release.
2016-08-17 11:48:33 -04:00
e72bdc9bc5
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-08-17 11:41:12 -04:00
Ansariel