Commit Graph

38064 Commits (6d94bb263fe7ab6eac2d578befdee6fdb4779c15)

Author SHA1 Message Date
Nat Goodspeed 6d94bb263f DRTVWR-418: Update viewer-manager to codeticket version 510348. 2017-10-31 14:01:34 -04:00
Nat Goodspeed d78391a27b DRTVWR-418: Update viewer-manager to codeticket version 510328. 2017-10-31 11:45:53 -04:00
Nat Goodspeed 2690ad4b38 DRTVWR-418: Update viewer-manager to codeticket version 510301. 2017-10-30 17:28:22 -04:00
Nat Goodspeed 7e15d6ae4a Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-10-30 11:15:52 -04:00
Nat Goodspeed f643f79f09 DRTVWR-418: Update viewer-manager to codeticket version 510243. 2017-10-27 15:22:12 -04:00
Nat Goodspeed 8ffaa4242b DRTVWR-418, MAINT-7911: Merge to build 510144 of VMP 2017-10-26 10:13:12 -04:00
Nat Goodspeed d8ea2a8a27 MAINT-7911: Update to viewer-manager build 510144 2017-10-26 09:48:26 -04:00
Nat Goodspeed cc398dc397 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-10-26 09:42:14 -04:00
Nat Goodspeed 263f285697 MAINT-7911: Update viewer-manager to codeticket version 510137. 2017-10-25 21:22:35 -04:00
Nat Goodspeed 3f84c43e14 MAINT-7911: Set build_data.json's Platform to win for both W32, W64. 2017-10-25 14:33:26 -04:00
Nat Goodspeed ead19aa22c MAINT-7081: Only request HTTP2 with $VIEWERASSET override (testing) 2017-10-24 15:57:36 -04:00
Nat Goodspeed 762582c499 MAINT-7081: Mention libnghttp2*.dylib in yet another place. 2017-10-24 15:38:00 -04:00
Nat Goodspeed b709a9d7e0 MAINT-7081: Fix bad merge into autobuild.xml.
Specifically, reinstate the curl, openssl, nghttp2 libraries to the previous
tip of this MAINT-7081 fork.
2017-10-24 13:22:03 -04:00
Nat Goodspeed 96ac49c3e2 MAINT-7081: Merge from lindenlab/viewer64. 2017-10-24 11:22:49 -04:00
Nat Goodspeed 8ba4f526c0 MAINT-7812: NSIS check for /marker before writing marker file.
The /marker switch is passed by the (new) VMP. If any user wants to explicitly
pass the /marker switch to the installer, s/he shouldn't mind ending up with
an nsis.winstall file in the download directory.
2017-10-18 16:16:34 -04:00
Nat Goodspeed b0eb67f6a8 MAINT-7812: Update to viewer-manager build 509841 2017-10-18 15:36:00 -04:00
Nat Goodspeed 9c5becd67d Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-10-13 13:50:46 -04:00
Kitty Barnett 7d63a3fa5f [FIXED] Access (write) violation / buffer overrun in LLTextureFetchWorker::doWork()
The trouble lines are:
			U8 * buffer = (U8 *) ALLOCATE_MEM(LLImageBase::getPrivatePool(), total_size);
			if (cur_size > 0)
			{
				memcpy(buffer, mFormattedImage->getData(), cur_size);
			}

If 'cur_size > mHttpReplyOffset + append_size' then 'total_size -= src_offset' will cause
total_size to be smaller than cur_size causing a write access violation on the memcpy.

Since the response is invalid it seemed best to make it follow the other failed partial condition.
(transplanted from 737e28ec6b4d74f3ff915a4effc13d7b615a6a9b)
2017-10-12 22:55:15 +02:00
Nat Goodspeed eafb0a32e3 DRTVWR-418: Remove redundant assignment per Ansariel Hiller. 2017-10-12 08:25:12 -04:00
Nat Goodspeed e80797a5ef MAINT-7081: Update to curl build 501064 2017-10-12 08:13:49 -04:00
Nat Goodspeed 6ab816cc68 DRTVWR-418: Fix glitch from merging from today's viewer-release 2017-10-11 16:50:51 -04:00
Nat Goodspeed 0c7bc67814 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-10-11 14:35:49 -04:00
Oz Linden b6d22de588 increment viewer version to 5.0.9 2017-10-11 09:10:47 -04:00
Oz Linden 4cee904dc3 Added tag 5.0.8-release for changeset 505a492f30bd 2017-10-11 09:10:47 -04:00
Nat Goodspeed 25be14381e MAINT-7831: Update to viewer-manager build 509523 2017-10-10 15:41:37 -04:00
Nat Goodspeed acf36ae829 MAINT-7081: Hack to allow overriding asset capability URL. 2017-10-10 15:12:05 -04:00
Nat Goodspeed c4c3438e88 MAINT-7831: Merge from tip of https://bitbucket.org/lindenlab/viewer64. 2017-10-09 16:50:50 -04:00
Nat Goodspeed 763a04ced2 MAINT-7831: Update viewer-manager to build 509481. 2017-10-09 16:47:35 -04:00
Nat Goodspeed 9e95301be5 MAINT-7809: Add secondlife.ico to viewer's vmp_icons install dir. 2017-10-09 16:46:22 -04:00
Nat Goodspeed f7fb6b4a0e MAINT-7831: Merge LLManifest.prefix() changes to tip. 2017-10-09 16:39:28 -04:00
Nat Goodspeed be0e3cb250 MAINT-7831: Update viewer_manifest.py to use 'with self.prefix(...):'
Now that LLManifest.prefix() supports use as a context manager:

    with self.prefix(...):
        ...

convert existing calls to that form.

This was an interesting exercise because it surfaced at least two places where
the indentation did not match the self.prefix() nesting, plus another place
where existing code was undented without a self.end_prefix() call. (That last
was an uncaught logic bug.) This underscores the value of using a SINGLE
consistent, idiomatic mechanism to limit the scope of each self.prefix() call.
2017-10-09 16:35:53 -04:00
Nat Goodspeed d9d6df313c MAINT-7831: Allow LLManifest.prefix() to be a context manager.
LLManifest.prefix() dates back to before Python had a 'with' statement or the
notion of a context manager. That's why every prefix() call requires a
corresponding end_prefix() call.

Existing usage is of the form:

    if self.prefix(...some args...):
        self.path(...)
        ...
        self.end_prefix()

The use of an 'if' statement is solely to allow the coder to indent the
statements between the self.prefix() call and the corresponding call to
self.end_prefix() -- there is no intention to make that code conditional.
self.prefix() unconditionally returned True to facilitate that usage.

But now that we have the 'with' statement, this all feels a little silly. Make
prefix() return an instance of a context-manager class so that it's reasonable
to say instead:

    with self.prefix(...some args...):
        self.path(...)
        ...

and have the Right Things happen simply by leaving the 'with' block.

The only tricky part is code to preserve compatibility with old-style usage:

* The context manager has a __nonzero__() method so that if it's tested in an
  'if' statement, it can unconditionally return True.

* On leaving the 'with' block, rather than simply popping the top of each
  prefix stack, the context manager restores its length to the same length it
  had before that prefix() call. This allows for (erroneous but hardly
  unlikely) usage of the form:

    with self.prefix(...some args...):
        self.path(...)
        ...
        self.end_prefix()

Restoring the previous length makes the context manager insensitive to whether
or not end_prefix() has popped the most recent prefix() entries.
2017-10-09 16:28:35 -04:00
Nat Goodspeed 922289264d MAINT-7831: Include secondlife.ico file in the Windows installer. 2017-10-06 14:13:38 -04:00
Nat Goodspeed de59932c29 MAINT-7684: Don't try to package or sign deleted Windows VMP .exes. 2017-10-05 22:54:33 -04:00
Nat Goodspeed a5f7f4fb1d MAINT-7684: Update viewer-manager to codeticket version 509386. 2017-10-05 21:44:31 -04:00
Nat Goodspeed b508488fc7 MAINT-7831: Update to viewer-manager build 509308 2017-10-04 16:40:33 -04:00
Nat Goodspeed 1d79b3825b MAINT-7081: Update to curl build 509254 2017-10-02 14:22:51 -04:00
Nat Goodspeed fd2a8f4798 MAINT-7081: Update to nghttp2 build 509246 2017-10-02 13:35:18 -04:00
Nat Goodspeed 6b508cd9d4 MAINT-7081: Eliminate unused variable errors after new refactoring.
The new helper functions check_curl_easy_setopt() and
check_curl_multi_setopt() encapsulate the pervasive idiom:

    code = curl_{easy,multi}_setopt(handle, option, arg);
    check_curl_{easy,multi}_code(code, option);

But since each of these helper functions contains its own local CURL{,M}code
variable 'code', having a caller-scope variable reused for every such call is
no longer necessary -- in fact is no longer used at all. That produces a fatal
warning with MSVC. Get rid of those now-unused variables.
2017-09-30 22:05:21 -04:00
Nat Goodspeed 586d697475 MAINT-7081: Try requesting HTTP/2 when a request wants pipelining. 2017-09-29 17:06:42 -04:00
Nat Goodspeed ee2a1902a5 MAINT-7081: Mention nghttp2.dll where it must be mentioned. 2017-09-29 08:46:44 -04:00
Nat Goodspeed a05214da35 MAINT-2081: Remove ancient snapshot of CMake GetPrerequisites.
Mani captured that snapshot back when CMake version 2.8 was newer than what
was running on our build systems. Now we have to assume that the bundled
GetPrerequisites.cmake is better than our old snapshot. Use the bunded one.
2017-09-29 08:45:45 -04:00
Nat Goodspeed 1a22b77064 MAINT-7081: Package all libnghttp2.*.dylibs.
To support that, enhance path_optional() to accept wildcards and return the
expanded filenames.
2017-09-28 17:58:03 -04:00
Nat Goodspeed 19bb6fd33e MAINT-7081: Mention nghttp2 library wherever it must be mentioned. 2017-09-27 15:27:30 -04:00
Nat Goodspeed c0adf5884d MAINT-7081: Update nghttp2 to build 508969. 2017-09-27 15:26:29 -04:00
Nat Goodspeed 4c6ecac206 MAINT-7081: Make packages-formatter.py handle multi-line copyrights.
The nghttp2 autobuild package has copyright information that embeds a newline.
autobuild install --copyrights correctly produces that information onto two
lines. But that means packages-formatter.py must process any lines that do not
match its expected 'packagename: copyright' pattern as the continuation of the
preceding package's copyright information.

Since the processing for autobuild install --versions is so very similar, fold
both into the same outer loop.

Also report all duplicates for any package, instead of stopping at the first.
2017-09-27 15:25:29 -04:00
Nat Goodspeed d4e939ddb5 MAINT-7081: Update to curl build 508978 2017-09-26 10:57:28 -04:00
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