Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Mnikolenko Productengine 252ca2542b MAINT-7890 Floater position drifts across logins after snapping to another floater 2017-10-13 17:54:32 +03:00
Mnikolenko Productengine 788d745071 MAINT-7899 FIXED Apparent broken material texture selection 2017-10-13 12:23:08 +03: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 69c6d6fc63 remove code duplicated in merge 2017-10-11 13:41:30 -04:00
andreykproductengine 5ee30b7da5 MAINT-7895 Fix for setHeaderCacheEntry infinite loop 2017-10-11 19:37:35 +03:00
AndreyL ProductEngine 3b2ffcff51 Merged in lindenlab/viewer-bear 2017-10-11 16:56:19 +03:00
Brad Payne (Vir Linden) 299592e88e merge 2017-10-11 14:16:39 +01:00
Oz Linden d62ad1ef8a merge changes for 5.0.8-release 2017-10-11 09:13:55 -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 9ea0c0dd93 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-10-11 08:56:49 -04:00
Nat Goodspeed 25f53850d4 Automated merge with ssh://bitbucket.org/nat_linden/viewer64-boost-1.65.1 2017-10-10 17:18:18 -04:00
Nat Goodspeed 33853d4d2c SL-793
Update boost to codeticket version 509519.
Update colladadom to codeticket version 509540.
Update googlemock to codeticket version 509541.
2017-10-10 16:49: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
Brad Payne (Vir Linden) aae13d1966 SL-704 - comment and dead code cleanup 2017-10-10 19:30:51 +01:00
Brad Payne (Vir Linden) 4ded45eb90 Sl-761 - removed the 90-degree fixup, so objects can be moved in a predictable and standard X-forward way in scripts. 2017-10-10 15:40:30 +01: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 acb8592b1b SL-793: Merge updates to colladadom and googlemock. 2017-10-09 12:18:20 -04:00
Nat Goodspeed 0300d493c5 SL-793
Update colladadom to codeticket version 509467.
Update googlemock to codeticket version 509463.
Update boost to codeticket version 509450.
2017-10-09 11:59:46 -04:00
Brad Payne (Vir Linden) 44ba5224bf MAINT-7870 - propagate new animated mesh flags even if they're being zeroed. handle notification of same to update control avatars on notification from elsewhere. 2017-10-09 00:41:41 +01:00
Nat Goodspeed 3b17466204 SL-793: Update to boost build 509450 2017-10-07 15:07:17 -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
Brad Payne (Vir Linden) 5cbb440344 SL-811 - make reset skeleton logic smarter. Should fix this bug and also allow animesh skeletons to be reset, although there's no way currently to exercise the latter capability. 2017-10-04 21:15:49 +01:00
Rider Linden 526087d9ab MAINT-7468: Show tooltip on disabled IM to Email if unverified email. 2017-10-04 12:43:53 -07:00
Brad Payne (Vir Linden) 20b7f4684c MAINT-7867 - changed simulator feature query so we're only looking in the agent's region. This assumes that all regions will have the same settings, which is normally a safe assumption. 2017-10-04 19:52:11 +01:00
Brad Payne (Vir Linden) 497a4109d8 SL-808 - direct area calculation matches indirect accumulation approach 2017-10-04 13:54:24 +01:00
Brad Payne (Vir Linden) 36c4424213 SL-808 - more work on arc display. area calculations still have some issues, especially for animated objects. 2017-10-03 22:26:00 +01:00
Brad Payne (Vir Linden) 217df36656 SL-808 - updated ARC display to largely work with animated objects. Gives some triangle information that we may or may not ultimately keep. Surface area calcs still not working 2017-10-02 21:52:24 +01: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
Brad Payne (Vir Linden) 853924c7ef SL-794 - use largest LOD for est tri count, instead of trusting that it's always the high LOD 2017-09-29 19:08:41 +01: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
Brad Payne (Vir Linden) 31f84c2a9a MAINT-7860 - made enablement rules same for rotation and translation, when editing an attached object via text widgets 2017-09-28 20:57:27 +01:00