livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,935 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

43935 Commits (fb6cb050e448bda7e802e2b8828f60ede54872bb)

Author SHA1 Message Date
Runitai Linden fb6cb050e4 SL-15975 Add Tracy-only profile macros that are no-ops when Tracy is disabled. 2021-09-13 12:41:57 -05:00
Michael Pohoreski 0f60db6220 Merged in SL-15709-Tracy (pull request #677) 
SL-15709: Windows: Include Tracy source directly; don't use a library
 2021-09-04 00:57:46 +00:00
Ptolemy 0528890ab1 Merge branch 'DRTVWR-541' of bitbucket.org:lindenlab/viewer into DRTVWR-541 2021-09-03 17:54:26 -07:00
Ptolemy 6d2cad965c SL-15709: Fix LLCommon not setting Tracy include directory and not linking to tracy.lib 2021-09-03 17:53:44 -07:00
Ptolemy 91f4d7f7a0 SL-15709: Use standardized autobuild name; set TRACY_INCLUDE_DIR if Tracy not enabled 2021-09-03 17:53:44 -07:00
Ptolemy 13ff2cba53 SL-15709: Add Darwin support 2021-09-03 17:53:44 -07:00
Ptolemy 92e53622ea SL-15709: Cleanup 2021-09-03 17:53:44 -07:00
Ptolemy a783f7c74a SL-15709: IF Tracy is enabled default to using only Tracy instead of Fast Timers; also print Tracy include directory 2021-09-03 17:53:44 -07:00
Ptolemy 61175cfa01 SL-15709: Default Tracy to off 2021-09-03 17:53:44 -07:00
Ptolemy 6d74ae649c SL-15709: Default to old fast timers 2021-09-03 17:53:44 -07:00
Ptolemy df5127136f SL-15709: Add Tracy support to viewer 2021-09-03 17:53:43 -07:00
Dave Houlton 2e88a32665 SL-15595 update viewer autobuild to import tracy lib 2021-09-03 17:53:43 -07:00
Dave Houlton aa358035a3 DRTVWR-528 remove wrapper code for RAD telemetry library 2021-09-03 17:53:43 -07:00
Ptolemy c37cc7c3a4 SL-15709: Windows: Include Tracy source directly; don't use a library 2021-09-03 17:20:22 -07:00
Michael Pohoreski c49b31a459 Merged in SL-15709-Tracy (pull request #672) 
SL-15709 Tracy
 2021-09-01 05:40:04 +00:00
Ptolemy 3176136686 SL-15709: Fix LLCommon not setting Tracy include directory and not linking to tracy.lib 2021-08-31 21:41:03 -07:00
Ptolemy 240000c01c SL-15709: Use standardized autobuild name; set TRACY_INCLUDE_DIR if Tracy not enabled 2021-08-31 21:23:10 -07:00
Ptolemy 88f335ac40 Merge branch 'master' into DRTVWR-541 2021-08-27 09:36:46 -07:00
Michael Pohoreski 134dc98636 Merged in SL-15709-Tracy (pull request #634) 
SL-15709: Add Tracy support to viewer
 2021-08-27 07:00:13 +00:00
Ptolemy cdf2bdafd3 SL-15709: Add Darwin support 2021-08-26 23:58:45 -07:00
Ptolemy c443dc51e4 SL-15709: Cleanup 2021-08-26 22:52:49 -07:00
Ptolemy bb601196dd SL-15709: IF Tracy is enabled default to using only Tracy instead of Fast Timers; also print Tracy include directory 2021-08-26 22:52:07 -07:00
Ptolemy 574b05531c SL-15709: Default Tracy to off 2021-08-26 22:50:08 -07:00
Nat Goodspeed c40b8310b0 Increment viewer version to 6.4.23 
following promotion of DRTVWR-531
 2021-08-09 17:51:23 -04:00
Ptolemy 908ce72179 SL-15709: Default to old fast timers 2021-07-30 09:37:29 -07:00
Ptolemy 7d5cd52498 SL-15709: Add Tracy support to viewer 2021-07-28 15:36:10 -07:00
Euclid Linden 7637f9845b Merged in euclid-541-lib (pull request #635) 
Viewer autobuild changes to to import tracy lib
 2021-07-28 21:12:27 +00:00
Dave Houlton 1a782ed690 SL-15595 update viewer autobuild to import tracy lib 2021-07-27 17:46:29 -06:00
Callum Prentice a242edc99d Merge with Master after Viewer Release (also fixed some glaring automerge screw ups) 2021-07-19 17:43:19 -07:00
Euclid Linden 08f04113c9 Merged in DV541-merge-6.4.22 (pull request #629) 
DRTVWR-541 merge up to v 6.4.22
 2021-07-19 21:52:37 +00:00
Dave Houlton aa322d8eb4 Merge branch 'master' v 6.4.22 into DRTVWR-541 2021-07-19 15:31:44 -06:00
Nat Goodspeed be6066eae2 Increment viewer version to 6.4.22 
following promotion of DRTVWR-516
 2021-07-14 23:27:32 -04:00
Callum Prentice 95b26d3bec Fix for SL-15560 pages with undefined html render with gray background instead of white in CEF v91 2021-07-12 14:17:04 -07:00
Andrey Kleshchev 35f2b14c1d Revert "SL-15434 Change default landmark destination" 
This reverts commit efc8b268a2.
 2021-07-13 00:05:04 +03:00
Callum Prentice 3602d64a09 Fix for SL-15559 PDF files do not load in CEF v91 2021-07-12 12:50:34 -07:00
Mnikolenko Productengine d38866d030 SL-15512 Update text in the Favorites Bar and Favorites window 2021-07-01 13:42:14 +03:00
Andrey Kleshchev efc8b268a2 SL-15434 Change default landmark destination 2021-06-30 23:24:27 +03:00
Andrey Kleshchev 21f70785d7 SL-15434 The 'Add to my Landmarks' star icon is not marked in the Top menu bar 2021-06-30 23:14:16 +03:00
Dave Houlton 10f84d8244 DRTVWR-528 remove wrapper code for RAD telemetry library 2021-06-25 15:43:35 -06:00
Andrey Lihatskiy a4c6c7059f Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llvoicevivox.cpp
 2021-06-25 00:51:02 +03:00
Callum Prentice 7ff743a138 Merge branch 'master' into DRTVWR-531 2021-06-24 14:37:20 -07:00
Nat Goodspeed 467d8339c9 Increment viewer version to 6.4.21 
following promotion of DRTVWR-518
 2021-06-24 15:52:37 -04:00
Andrey Kleshchev abf8c4b364 SL-10297 windows local build fix 
win_crash_logger will be fully removed in D520, for now just fixing local relwithdebinfo build
 2021-06-24 18:37:22 +03:00
Andrey Kleshchev 9451b50b2b SL-15292 waitForChannel crash #4 2021-06-23 19:48:45 +03:00
Andrey Kleshchev 7cc5b01ded SL-15292 waitForChannel crash #3 2021-06-23 19:19:35 +03:00
Andrey Kleshchev 9241a87b6f SL-15292 waitForChannel crash #2 2021-06-23 18:32:57 +03:00
Callum Prentice 38765be8b0 Fix for: SL-15433 Update version of CEF used in the Viewer to 91.0.4472.114 2021-06-21 19:18:58 -07:00
Callum Prentice 45135a7c58 Fix for: SL-15422 Update version of CEF used in the Viewer to 91.0.4472.101. Also includes a tweak to viewer_manifest.py to handle some CEF file changes" 2021-06-17 12:42:58 -07:00
Andrey Kleshchev c6b1aca74f SL-15406 Removed text below initial login screen screenshots 2021-06-16 21:35:11 +03:00
Callum Prentice 56b02aee2e Fix for SL-15389 -- Pull in the patch to add the Akamai cert fix specified in SL-15370 2021-06-11 11:03:39 -07:00