Commit Graph

37919 Commits (ecaa77c5a64c8aecdac813cc6b5accf02cf66b96)

Author SHA1 Message Date
Nat Goodspeed ecaa77c5a6 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-09-26 10:56:09 -04:00
Oz Linden aa62145e1f update VMP to 1.0.508931 2017-09-23 08:25:03 -04:00
Oz Linden 545b03da71 MAINT-7827: suppress doubled notices on various login problems 2017-09-22 15:33:33 -04:00
Oz Linden 02117b8b7b re-add support for a voice connection failure message used by damballah 2017-09-22 14:58:46 -04:00
Oz Linden 3ceeec3afb integrate VMP fixes 2017-09-22 14:56:52 -04:00
Oz Linden 38d9454cbf remove redundant exception constructor code, and
generalize exception catching for platform specific code
2017-09-21 19:24:04 -04:00
Oz Linden 6ac6826192 Clean up running commands under viewer_manifest (at least a little)
* do not redirect stderr to stdout
* catch errors generated in platform specific code and display them more nicely
* run_command no longer captures output (only used in one place;
  replaced that with direct use of subprocess)
2017-09-21 15:50:29 -04:00
callum_linden b42e2da9df Automated merge with head of viewer64 2017-09-21 14:01:48 -07:00
callum_linden cdba690ec9 Fix for MAINT-7787: [Alex Ivy] RC Viewers in 5.1.0 range show black background for CONTENT_TYPE_HTML. (The color we pass to CEF has 4 compontents red, blue, green and alpha. We were only passing 3 and setting the color and not the alpha. At somepoint in CEF's history the default value must have changed. Passing 0xFF for alpha too - i.e. fully opaque - fixes this) 2017-09-21 14:01:20 -07:00
Nat Goodspeed 1e49cd9b00 DRTVWR-418: Disable more needlessly fragile memory consumption tests. 2017-09-20 17:11:06 -04:00
Nat Goodspeed d1ab470542 DRTVWR-418: Fix C++ errors detected by Xcode 9.
You can't legitimately perform an ordered comparison between a pointer and an
int, even 0. Fix a number of 'if (ptr > 0)' to plain 'if (ptr)'.

Fix LLEditWearableDictionary::WearableEntry constructor to avoid varargs
mechanism. It used to accept three different counts, followed by three
different lists of enums, fetched in each case as 'int' -- dubious in itself.
The constructor body performed three different loops to populate those enums
into three different member vectors.

Instead, make the constructor accept three vectors and initialize the member
vectors from the passed vectors. Now that C++ has inline vector
initialization, change existing constructor calls to pass temporary vectors
initialized with what used to be the varargs enum values.
2017-09-20 16:58:58 -04:00
Nat Goodspeed eae144219c DRTVWR-418: Another attempt to generate Mac debug symbols.
The viewer's 00-COMPILE-LINK-RUN.txt recommends passing -gdwarf-2 to the Mac
compiler, and so we've been doing ever since before the viewer-build-variables
repo was engaged. Now we discover that when CMake sees -gdwarf-2, it removes
the -g switch entirely. It also removes it when you pass plain -g. Only when
you pass -gdwarf-with-dsym or just -gdwarf does CMake pass plain -g to the
compiler. Change -gdwarf-2, if specified, to -gdwarf so we at least get -g.
2017-09-19 15:35:08 -04:00
ruslantproductengine 0e9fb587fa MAINT-7813 - 3D rendering broken on Windows in build 508618. 3D rendering starts before 2D login screen is cleared.
FIXED
2017-09-18 21:02:53 +03:00
Nat Goodspeed c886351fdc MAINT-7081
Update openssl to codeticket version 508328.
Update curl to codeticket version 508652.
2017-09-18 10:24:47 -04:00
Nat Goodspeed bb490f72d8 MAINT-7081: Add nghttp2 build 508613 to viewer build. 2017-09-18 10:03:26 -04:00
Oz Linden c670ee835a update to viewer-manager 1.0.508640 for MAINT-77814 fix 2017-09-16 14:18:46 -04:00
Oz Linden 87ab1f7cbc merge CEF fixes from callum 2017-09-15 13:58:41 -04:00
Oz Linden c73382f906 integrate viewer-manager 1.0.508600 2017-09-15 13:38:08 -04:00
Oz Linden f938ee99d1 additional logging to help with MAINT 7807 2017-09-15 12:03:05 -04:00
Oz Linden 2bdb3b4411 add address size to build_data.json so that SL_Launcher can log it 2017-09-15 11:59:50 -04:00
Oz Linden 6883c6b1f6 replace a 'continue' with an 'else' 2017-09-14 16:56:51 -04:00
Oz Linden 193dadb62c merge changes for MAINT-7129 2017-09-14 16:53:23 -04:00
ruslantproductengine 46dc097516 MAINT-7129 - [Project Alex Ivy][MAC] Materials and ALM shaders broken in Mac viewer
FIXED
2017-09-14 16:39:01 +03:00
Oz Linden 09d606ccf7 integrate viewer-manager fixes for MAINT-7772 2017-09-08 16:01:12 -04:00
Oz Linden b501c36559 mark some settings no longer used by update as obsolete 2017-09-08 14:39:10 -04:00
Oz Linden 1461b60e2c MAINT-7772: make update mode three choices: automatic, ask, and mandatory only 2017-09-08 14:38:42 -04:00
callum_linden 934d09e814 Hopeful fix for MAINT-7654 Ivy] Japanese can't input in CEF 2017-09-01 17:03:31 -07:00
Nat Goodspeed 2f39ed4a80 MAINT-7742: Update viewer-manager to codeticket version 508202. 2017-08-31 19:15:23 -04:00
callum_linden 8e6b5947b4 Fix for MAINT-7531 Second comment with text 'Write a comment...' appears, when user post comment to Profile Feed and MAINT-7651 Cannot post new message in feed because the 'Share something...' Share button never becomes active. The fix was in Dullahan Mac keyboard code - used to send a keyb event and then char code after for down and not for up. Now sends it for up and not down and works as expected for these 2 test cases as well as some JavaScript keyboard test pages 2017-08-31 15:51:14 -07:00
Oz Linden c662e173ab merge up latest integration repo 2017-08-24 09:48:04 -04:00
Nat Goodspeed 40b4cbf2c7 DRTVWR-418: Trivial change to bump the TeamCity build. 2017-08-24 07:21:23 -04:00
Oz Linden bd08855ec5 merge changes for MAINT-7594 2017-08-23 13:27:05 -04:00
Nat Goodspeed 8d9241be77 MAINT-7661: Update to viewer-manager build 507954 2017-08-22 21:13:32 -04:00
Nat Goodspeed 714b911a40 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-08-22 21:00:44 -04:00
callum_linden b5dbb9c52a Automated merge with head of ll/viewer64 after DRTVWR-439 merge 2017-08-22 14:32:04 -07:00
Oz Linden 58176de957 merge changes for 5.0.7-release 2017-08-22 17:19:50 -04:00
Oz Linden 08cbed55ef increment viewer version to 5.0.8 2017-08-22 17:10:02 -04:00
Oz Linden f5f556fd46 Added tag 5.0.7-release for changeset abcab37e1b29 2017-08-22 17:10:02 -04:00
Oz Linden 6980f5bcc2 MAINT-7594: add platform name string to login request (and add request parameter logging at DEBUG) 2017-08-22 16:38:15 -04:00
Nat Goodspeed 90c0138721 MAINT-7661: Update to viewer-manager build 507912. 2017-08-21 12:43:04 -04:00
Nat Goodspeed cb789b2a57 MAINT-7661: Update to viewer-manager build 507905 2017-08-18 21:18:54 -04:00
Nat Goodspeed 5482890cd1 MAINT-7661: Update VMP to new build 507880. 2017-08-18 14:59:23 -04:00
Nat Goodspeed 1d2ded8c5f MAINT-7661: Make NSIS installer place .winstall marker file.
This reduces a timing hole in which one instance of SL_Launcher might place
a .winstall marker file in the download directory and run the downloaded
installer, but another SL_Launcher instance might discover that marker and try
to delete the directory before the NSIS install completes.
2017-08-17 18:48:41 -04:00
Oz Linden 01e0b78c59 merge changes for DRTVWR-439 2017-08-16 15:43:58 -04:00
callum_linden 8e6751efce Fix MAINT-7312 External web links opened in profile window 2017-08-15 17:19:44 -07:00
Nat Goodspeed 2368c44a8e DRTVWR-418: Disable another fragile llcorehttp memory-usage check. 2017-08-15 16:31:17 -04:00
Oz Linden b77d109d46 Merged in lindenlab/viewer64-maint-7643 (pull request #17)
MAINT-7643

Approved-by: Oz Linden <oz@lindenlab.com>
Approved-by: Nat Linden <nat@lindenlab.com>
2017-08-15 15:29:23 +00:00
Oz Linden bafe85a0f6 Merged in rider_linden/viewer64-gundam (pull request #18)
Default
2017-08-15 15:28:52 +00:00
Rider Linden 79856e6554 MAINT-7634: Feedback from code review, move enum to string converter to own function. 2017-08-14 14:54:58 -07:00
Oz Linden 4cc6d44ef8 fix indenting 2017-08-14 11:55:31 -04:00