Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
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
callum_linden 0ee774c39f Missed a place in the Copy3rdPartyLibs.cmake file (thank Windows Find) that needs to differentiate between 32 and 64 bit Windows builds 2017-10-23 11:37:06 -07:00
callum_linden 6cbb00fe85 Differentiate between 32/64 bit windows builds for build systewm (BugsSplat enforces specifc names that vary across bitness) 2017-10-19 18:35:00 -07:00
callum_linden e75b16f358 First pass at adding BugSplat code to viewer and turning off existing (Google Breakpad) exception handling 2017-10-19 11:34:36 -07:00
callum_linden 803b75a718 First version that builds with a dummy BugSplay call in llapp.cpp 2017-10-18 18:36:10 -07: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 eeecf8d2b2 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-10-16 10:17:31 -04:00
Nat Goodspeed e737137f4c Automated merge with ssh://bitbucket.org/nat_linden/viewer64-boost-1.65.1 2017-10-16 10:14:54 -04:00
Ansariel f1c76a376c STORM-2151: Respect "Hide cursor while typing" user setting on Windows 2017-10-16 10:41:45 +02:00
AndreyL ProductEngine 8c03881193 Merged in lindenlab/viewer-lynx 2017-11-22 16:44:36 +02:00
Mnikolenko Productengine c1e55d37b6 MAINT-8016 Crash in LLFloaterAvatarRenderSettings::removePicker() 2017-11-21 18:32:18 +02:00
Mnikolenko Productengine f72015980d MAINT-8007 Music do not start playing after disabling 2017-11-21 11:19:56 +02:00
andreykproductengine 3bf1e4cb46 MAINT-581 Terrain detail remains on High when Graphics Quality is set to Low 2017-11-20 17:58:18 +02:00
andreykproductengine 9de2af8b2d MAINT-7847 Remake of 'white alpfa' fix 2017-11-13 14:26:15 +02:00
andreykproductengine 8da9e0ffd7 MAINT-72 unmapBuffer crash 2017-11-17 17:33:10 +02:00
Mnikolenko Productengine 667f2fedef MAINT-8013 FIXED Unnecessary tab change after using 'Show in Main panel' for items from 'Received items' panel 2017-11-17 17:21:25 +02:00
Mnikolenko Productengine 6fb3b50a29 MAINT-8006 FIXED The items from 'Received items' panel are not displayed in 'Worn' tab 2017-11-16 18:11:38 +02:00
Mnikolenko Productengine ab7c952645 MAINT-7988 Received Items should be searchable via inventory 2017-11-16 00:24:54 +02:00
andreykproductengine 6464016c11 MAINT-7997 Fixed dialog text failing to get focus when selected 2017-11-15 19:15:49 +02:00
AndreyL ProductEngine 627abf0957 Merged in lindenlab/viewer-lynx 2017-11-14 20:35:07 +02:00
AndreyL ProductEngine e2e23eb5cb Merged in lindenlab/viewer-lynx 2017-11-14 19:52:15 +02:00
andreykproductengine 83b0467f9f Backed out changeset: 544a91982eba
Originally a fix for MAINT-4773. This was causing a number of issues since
changes made in this code were pushing null textures into server and viewer
should not modify 'content' at server of own violition.
2017-11-10 20:33:51 +02:00
Andrey Kleshchev 9d962be2a8 Merged in MAINT-2880
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Simon Linden <simon@lindenlab.com>
2017-11-09 16:49:36 +00:00
Mnikolenko Productengine 17c22d317f MAINT-2880 Particle generator object doesn't start displaying particles, when unblocking the owner of this object 2017-11-09 16:09:51 +02:00
andreykproductengine 5ec95b7646 MAINT-7990 Fixed avatar physics twitching at high fps 2017-11-09 16:06:59 +02:00
Mnikolenko Productengine a4c3f5aaae MAINT-7940 Don't decrease character limit when sending snapshot to Twitter. Increase limit to 280 2017-11-08 12:13:50 +02:00
Nat Goodspeed 9117ee5b46 SL-793: Update to colladadom build 509683 2017-10-13 17:06:19 -04:00
Nat Goodspeed 2e23484d66 SL-793: Update to googlemock build 509686 2017-10-13 17:05:49 -04:00
Nat Goodspeed 6f0872674b SL-793: Update to boost build 509640 2017-10-13 17:05:42 -04:00
Nat Goodspeed 1e00c9ade3 SL-793
Update boost to codeticket version 509640.
Update colladadom to codeticket version 509683.
Update googlemock to codeticket version 509686.
2017-10-13 14:54:31 -04:00
Nat Goodspeed 9c5becd67d Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-10-13 13:50:46 -04:00
Kitty Barnett 18fa2e6471 MAINT-7081 [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
andreykproductengine 5a7b36d506 MAINT-1114 crash at LLVOAvatar updateGeometry() 2017-10-27 21:29:15 +03:00
andreykproductengine d7732280a9 Merged from viewer-lynx 2017-10-27 21:00:18 +03:00
andreykproductengine fbb5e8b68c MAINT-5261 The "Ping Interpolate the object position" seems to no longer work 2017-10-23 22:06:46 +03:00
andreykproductengine 76c7eb7310 Backed out changeset: bfa432c3c7d5 (SL-775) 2017-10-23 17:28:18 +03:00
andreykproductengine 7697f7f9a6 MAINT-7929 Viewer shouldn't attempt to access unreadable cache indefientely 2017-10-23 17:15:00 +03:00
Mnikolenko Productengine 628e28639d MAINT-7906 Inventory filter fix 2017-10-20 15:41:38 +03:00
Mnikolenko Productengine 9a34791488 MAINT-7906 FIXED Inventory jumps when detaching worn items in appearance panel 2017-10-19 17:07:22 +03:00
andreykproductengine 72b0cb1467 MAINT-7779 Logging update 2017-10-18 16:31:36 +03:00
Mnikolenko Productengine cf8283bd04 MAINT-7910 Appearance floater's chosen tab is not remembered between sessions. 2017-10-18 14:44:30 +03:00
andreykproductengine c0492e5448 MAINT-989 Velocity and acceleration should take time into account 2017-10-17 20:02:29 +03:00
AndreyL ProductEngine 6ccdc34981 Merged in lindenlab/viewer-bear 2017-10-18 00:26:48 +03:00
eli 948f325571 FIX INTL-264 translations in 9 languages for Viewer Set48 on repository viewer-bear 2017-10-17 14:11:29 -07:00
AndreyL ProductEngine e347b9ad65 MAINT-7592 Fixed the checkbox/label behavior 2017-10-17 20:27:42 +03:00
andreykproductengine 9a7f1e782c MAINT-7902 Fixed Opening Marketplace Listing before inventory has fetched unlists listings 2017-10-13 16:12:15 +03:00
AndreyL ProductEngine c582029269 Merged in lindenlab/viewer-lynx 2017-10-16 15:23:13 +03:00
andreykproductengine 86314969e6 Backed out MAINT-989, changeset: 0a9a1e276e57 2017-10-16 12:24:42 +03:00