1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
283c2a20cc
Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
...
sets the property on those.
2022-05-01 00:38:40 +02:00
786b291d9c
Move CMake files to modernized cmake syntax, step 1.
...
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
627eecd577
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 08:22:59 +01:00
a8df27ccdd
FIRE-31248; Fixup older GCC vesions.
2021-10-16 21:44:17 +02:00
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
738e5c2659
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-15 19:56:26 +02:00
dde3c2c7a8
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-06-05 14:03:30 +02:00
9e415cdbb2
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-25 11:03:48 +02:00
2922c59316
Merge branch 'sl-10297' into DRTVWR-516-maint
2021-05-21 20:31:53 +03:00
d313d7021f
SL-15200: Add LLApp::sleep(duration) methods.
...
Two sleep() methods: one accepting F32Milliseconds, or in general any LLUnits
time class; the other accepting any std::chrono::duration.
The significant thing about each of these sleep() methods, as opposed to any
freestanding sleep() function, is that it only sleeps until the app starts
shutdown. Moreover, it returns true if it slept for the whole specified
duration, false if it woke for app shutdown.
This is accomplished by making LLApp::sStatus be an LLScalarCond<EAppStatus>
instead of a plain EAppStatus enum, and by making setStatus() call set_all()
each time the value changes. Then each new sleep() method can call
wait_for_unequal(duration, APP_STATUS_RUNNING).
Introducing llcond.h into llapp.h triggered an #include circularity because
llthread.h #included llapp.h even though it didn't reference anything from it.
Removed. This, in turn, necessitated adding #include "llapp.h" to several .cpp
files that reference LLApp but had been depending on other header files to
drag in llapp.h.
2021-05-17 13:37:13 -04:00
e6c34f01d2
Revert revert of Simplified Cache viewer release - continue with simplified cache
...
This reverts commit 40ad606ae0906cfe699d
2021-03-10 15:13:12 +01:00
40ad606ae0
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer (Revert of Simplified Cache viewer release)
2021-03-10 15:10:41 +01:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09 14:39:51 -08:00
ec824a16d5
Merge branch 'master' into DRTVWR-516-maint
2021-03-09 21:57:53 +02:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
c36098c881
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-03 21:20:43 +01:00
6b6b116fd4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-03-03 00:20:02 +01:00
135d54a4ff
Merge branch 'master' into DRTVWR-516-maint
2021-03-02 21:41:37 +02:00
14fb8f66f8
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-24 16:34:12 +02:00
d9448c6f52
The folder where the disk cache lives was originally renamed from llvfs to llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-17 09:45:06 -07:00
2e6f516411
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16 21:12:53 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-09-16 18:53:24 -07:00
8c8eac256b
SL-13927 Turn SSL verification On for all SL services in viewer
2020-09-11 16:32:19 +03:00
a9d271c5a2
SL-10297 merged 6.4.7
2020-08-24 13:11:07 -04:00
27715d4d03
Merge remote-tracking branch 'll/d476' into fs-eep-vs2017-d476
2020-05-21 06:54:02 +02:00
69de6ece31
Use reinterpret_cast to pass pthread_self (pthread_t) into CRYPTO_THREADID_set_pointer (void*).
2020-03-25 18:40:45 -04:00
663b9ff6af
DRTVWR-476: pthread_self() also needs CRYPTO_THREADID_set_pointer()
2020-03-25 16:12:46 -04:00
3753dbd5ed
DRTVWR-476: Use OpenSSL API suitable for 64-bit pointers.
...
In three different places we use the same pattern: an ssl_thread_id_callback()
function (a static member of LLCrashLogger, in that case) that used to be
passed to CRYPTO_set_id_callback() and therefore returned an unsigned long
representing the ID of the current thread.
But GetCurrentThread() is a HANDLE, an alias for a pointer, and you can't
uniquely cram a 64-bit pointer into an unsigned long.
Fortunately OpenSSL has a more modern API for retrieving thread ID. Pass
each ssl_thread_id_callback() function to CRYPTO_THREADID_set_callback()
instead, converting it to accept CRYPTO_THREADID* and call
CRYPTO_THREADID_set_pointer() or CRYPTO_THREADID_set_numeric() as appropriate().
2020-03-25 16:12:46 -04:00
9627eddb10
document that old crash logger is not used in production builds
2019-06-12 08:51:01 -04:00
1b4a6eeea6
Merge with viewer-vs2107
2019-06-07 20:06:52 +02:00
0f2d02e12d
Use reinterpret_cast to pass pthread_self (pthread_t) into CRYPTO_THREADID_set_pointer (void*).
2019-06-06 20:59:01 +02:00
1969b4bf52
Merge with phoenix-firestorm-lgpl
2019-06-06 09:59:44 +02:00
ebcfbf277e
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2019-06-05 14:15:15 -04:00
b75b1eb789
Merge viewer-vs2017
2019-03-31 01:37:56 +01:00
fa15830e02
SL-10291 Replace apr_atomic with standard C++11 functionality
2019-01-15 18:31:17 +02:00
dcc2bbbd30
DRTVWR-476: pthread_self() also needs CRYPTO_THREADID_set_pointer()
2018-10-28 22:30:42 -04:00
1d11bc3c03
DRTVWR-476: Use OpenSSL API suitable for 64-bit pointers.
...
In three different places we use the same pattern: an ssl_thread_id_callback()
function (a static member of LLCrashLogger, in that case) that used to be
passed to CRYPTO_set_id_callback() and therefore returned an unsigned long
representing the ID of the current thread.
But GetCurrentThread() is a HANDLE, an alias for a pointer, and you can't
uniquely cram a 64-bit pointer into an unsigned long.
Fortunately OpenSSL has a more modern API for retrieving thread ID. Pass
each ssl_thread_id_callback() function to CRYPTO_THREADID_set_callback()
instead, converting it to accept CRYPTO_THREADID* and call
CRYPTO_THREADID_set_pointer() or CRYPTO_THREADID_set_numeric() as appropriate().
2018-10-25 10:58:12 -04:00
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
3a1fcb9521
Merge Firestorm LGPL
2018-01-17 20:28:45 +01:00
06db7c626f
Merge Firestorm LGPL
2017-10-11 17:58:16 +02:00
2d6314182b
Merge Firestorm LGPL
2017-10-11 19:53:58 +02:00
7c97b96d5d
Merge viewer-neko
2017-08-30 20:00:53 +02:00
9d9c04b044
MAINT-7691 One more crashreported issue with unicode in windows
2017-08-30 17:44:21 +03:00
8f49a267da
MAINT-7691 Crash report is not generated/sent if appdata path contains unicode symbols
2017-08-29 19:47:20 +03:00
915496bbea
Merge viewer-vivox
2017-03-21 22:14:02 +01:00
0a7fd3686a
Look for logcontrol-dev.xml in the user settings directory
2017-02-27 09:52:50 -05:00
6d3df79ea9
Merge #3 with lgpl.
2017-02-06 12:07:45 +01:00
688bf1e547
Synchronize with viewer64 source.
2017-01-11 15:36:33 +01:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
Ansariel