c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
171c00d0bb
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-28 12:48:13 +02:00
647d0224d3
SL-16243 Add Tracy timers to global new/delete overrides.
2021-10-25 21:11:03 +00:00
4bdc1843ca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-14 22:50:36 +02:00
6b2e40157b
Merge branch 'master' v6.4.24 into DRTVWR-546
2021-10-13 16:41:24 -06: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
a35544c701
SL-16027: Add Tracy OpenGL support
2021-09-21 16:10:52 -07:00
7cdd463954
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-09-20 13:16:41 +02:00
7a845ee23b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-522
2021-09-20 12:59:14 +02:00
7fc6519208
DRTVWR-545 Megre fix
2021-09-03 10:49:45 +03:00
33c20ba190
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-24 14:49:13 +02:00
97f09de4fc
Merge branch 'master' into DRTVWR-520-apple-notarization
...
# Conflicts:
# autobuild.xml
# build.sh
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-12 23:13:12 +03:00
4c4dfb682a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 13:35:31 +02:00
9718a38e9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 03:07:48 +02: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
ec8bef8e9c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/bugsplat.cmake
# indra/newview/llappdelegate-objc.mm
2021-07-06 10:32:52 +02:00
cbe3910620
Cleanup cache clearing to re-enable threaded clear
...
fixup silly mis-edits
2021-07-04 00:12:13 +01:00
826ee26272
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-06-08 19:55:43 +02:00
74711a2cf2
SL-15196 Attach correct log file to Bugsplat report
2021-05-26 14:57:31 +03: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
fd1545197a
SL-10297: Merge branch 'sl-10297-oz' into sl-10297.
...
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few
other miscellaneous goodies.
2021-05-12 13:56:19 -04:00
db72dc7d0f
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-02 19:33:18 +02:00
7e8aed44a6
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-03-17 18:47:16 +01:00
6b73a8331f
SL-14541 removed breakpad, win_crash_logger, updated zlib
2021-03-17 00:19:38 +02:00
ed98ebb811
SL-14961 Coroutine crash was not reported to bugsplat
2021-03-13 11:21:01 +02:00
4076208a72
SL-14961 Bugsplat logging
2021-03-12 00:25:53 +02: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
19ff86fabd
Merge branch 'master' into DRTVWR-522-maint
2021-03-09 22:00:08 +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
2ff2a32cfc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-03 23:40:00 +01:00
6b6b116fd4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-03-03 00:20:02 +01:00
be83a004db
Merge branch 'master' into DRTVWR-522-maint
2021-03-02 21:42:51 +02:00
339c3c5df4
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-18 18:55:37 +01:00
663e45c7ea
SL-1028 Bugsplat based windows viewers should not overwrite log files from main instance
2021-01-11 20:43:02 +02:00
38faec3b11
Merge branch 'master' into DRTVWR-519
2020-09-22 13:07:39 -07:00
8c289ec126
Effective rename of DRTVWR-506-simple since there is no way to rename a branch. Cloned canonical viewer into DRTVWR-519, copied over the files that changed from DRTVWR-506-simple and pushed back. Once I am satisfied everything is correct, DRTVWR-506-simple will be removed
2020-09-11 10:00:17 -07:00
a9d271c5a2
SL-10297 merged 6.4.7
2020-08-24 13:11:07 -04:00
9406b757a3
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
67255f5d64
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-07-29 13:23:00 +02:00
c7804dbf7e
Merge remote-tracking branch 'll/d476' into fs-vs2017-d476
2020-07-20 11:53:09 +02:00
01128f9f94
DRTVWR-476, SL-13528: Use freopen_s() instead of assigning stderr.
...
The llappviewerwin32.cpp create_console() function called by
LLAppViewerWin32::initConsole() used to assign *stderr = *(new FILE* value),
and so forth for stdout and stdin. That dubious tactic no longer works with
the new Windows CRT introduced with VS 2015. freopen_s() works much better.
2020-07-01 16:29:59 -04:00
d8649dbb8a
SL-13361: Enable color processing on Windows 10 debug console.
...
(cherry picked from commit 0b61150e69
2020-07-01 13:38:05 -04:00
4708662091
SL-13361: Distill redundant create_console() code to set_stream().
...
There are separate stanzas in llappviewerwin32.cpp's create_console() function
for each of STD_INPUT_HANDLE, STD_OUTPUT_HANDLE and STD_ERROR_HANDLE. SL-13361
wants to add more code to each. Factor out new local set_stream() function and
make create_console() call it three times.
(cherry picked from commit 13b78a0c5a
2020-07-01 13:33:29 -04:00
7c7e3ae8ba
Merge remote-tracking branch 'fs/master' into fs-eep-vs2017-d476
2020-06-03 19:28:05 +02:00
6a05670f6f
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-06-03 09:26:07 +02:00
da69b44aff
Windows/Bugsplat; Capture minidump and log file and put them into a unique dump dir.
2020-05-29 21:38:50 +02:00
46e600a034
Windows; Add logging for %TEMP% detection to to BugSplat error on FIRE-29623
2020-05-29 19:52:30 +02:00
Ansariel