Commit Graph

35793 Commits (d2cf09e7d2fb3eefd4bed4e5341849ee940b9018)

Author SHA1 Message Date
Ansariel d2cf09e7d2 STORM-2133: VOICE-36 prevents proper shutdown of connector 2016-07-14 10:28:54 +02:00
Oz Linden f868e29945 increment viewer version to 4.0.7 2016-07-06 16:52:24 -04:00
Oz Linden e67b8e3095 Added tag 4.0.6-release for changeset 4070611edd95 2016-07-06 16:52:23 -04:00
AndreyL ProductEngine 445cd96293 Merged in lindenlab/viewer-release 2016-05-20 00:03:30 +03:00
Oz Linden c2ef3b4c71 increment viewer version to 4.0.6 2016-05-19 10:25:05 -07:00
Oz Linden ea08e23cf3 Added tag 4.0.5-release for changeset 450de775fff6 2016-05-19 10:24:24 -07:00
Oz Linden 94c667c9ab merge changes for MAINT-6392 2016-05-10 12:05:21 -04:00
Rider Linden 5fdc540e57 MAINT-6392: Do not change the URL used for getting cookies (except to pass it to CEF) The original URL is used for HTTP Core access to profile functionality. 2016-05-09 14:20:21 -07:00
Oz Linden 39a0d18e39 gratuitous change for new ticket number 2016-05-07 08:29:36 -04:00
AndreyL ProductEngine 6f5f307e0a Merged in oz_linden/maint-5974 2016-05-06 23:32:00 +03:00
AndreyL ProductEngine b32d00308e Merged in lindenlab/viewer-release 2016-05-06 17:31:36 +03:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Oz Linden 7f5e6cea12 fix cmake warning by conditionalizing dependency that does not exist on Macs 2016-05-06 09:19:12 -04:00
Oz Linden a07a8cbf6e merge changes for 4.0.4-release 2016-05-06 09:05:51 -04:00
Oz Linden 94559950a2 increment viewer version to 4.0.5 2016-05-06 08:56:31 -04:00
Oz Linden 1114d681f1 Added tag 4.0.4-release for changeset 0a5de9ec2cb8 2016-05-06 08:56:31 -04:00
Oz Linden c938e16506 various changes required to compile on new clang 2016-05-05 13:53:07 -04:00
Oz Linden 20198b750d cosmetic fixes to basic graphics and preset selection 2016-05-04 18:01:59 -04:00
Oz Linden 0e5c8ed390 add max avatar complexity slider to basic graphics preferences 2016-05-04 10:16:53 -04:00
Ansariel dac6a7a4e3 Fixed disabling of Windows error reporting 2016-05-02 16:34:37 +02:00
Ansariel Hiller e5b206c321 Fixed startup crash on Windows 2016-05-02 11:34:14 +00:00
Oz Linden 9a83367e43 MAINT-6373: allow user to ignore notices about whether or not they are being rendered 2016-04-29 14:07:57 -04:00
Oz Linden f495ca8f1a Adjust some avatar complexity defaults (mostly slightly upwards)
Make more settings between mac and windows the same
Remove solaris and xp featuretables, since we don't support them any more
2016-04-29 10:52:43 -04:00
Oz Linden ff6d4b517f minor code clarity improvements 2016-04-28 14:42:13 -04:00
Oz Linden e81135b5d8 adjust avatar complexity defaults to be more generous and more consistent 2016-04-28 11:28:46 -04:00
Oz Linden f17d4edbe8 clean up terminology for jelly dolls / avatar complexity 2016-04-28 10:53:15 -04:00
Oz Linden fab1381d60 shorted default time for complexity notices 2016-04-28 10:52:34 -04:00
Rider Linden 3771778ac3 Merge 2016-04-26 16:20:01 -07:00
Rider Linden 66dd72459a MAINT-6336: Initialize TempBoundListener with constructor 2016-04-26 13:44:44 -07:00
Rider Linden dd2311b993 MAINT-6336: Put the timeout upstream of the suspending pump and fire the timeout it. Also some cleanup on LLSD construction in vivox. 2016-04-26 11:56:25 -07:00
Oz Linden 5c70d7ed2b Suppress avatar complexity notices if ShowMyComplexityChanges is zero 2016-04-26 14:08:28 -04:00
Oz Linden 7eb14ba3ef allow warnings from autobuild 2016-04-26 09:46:31 -04:00
Rider Linden 1eaed3d37f Merge 2016-04-25 12:12:18 -07:00
Rider Linden 4d9dd3271b MAINT-6338: Add methods for getting and setting boolean properties from gSavedSettings in the HTTPCore. Use those methods to access new key HTTPLogBodyOnError. Dump body of HTTP message to log in case of error if this key is true. 2016-04-25 12:06:33 -07:00
Rider Linden 1fa2757511 Debug code snuck in. 2016-04-22 15:14:30 -07:00
Rider Linden fd8b7a3934 Merge 2016-04-22 14:52:36 -07:00
Rider Linden 899489ae0a MAINT-6336: Centralize waiting on event pump with a timeout. Shorten the lifespan of a timeout event pump lifespan to be no longer than necessary. Change all references to the LLEventTimer to instead uses the centralized version. 2016-04-22 12:07:27 -07:00
Oz Linden 574963ff6d spruce up the README (I needed a change to force a new build number) 2016-04-22 14:00:46 -04:00
Andrey Lihatskiy d6f454831f Merged lindenlab/viewer-bear into default 2016-04-22 04:23:53 +03:00
AndreyL ProductEngine 56f736b654 Merged in cinderblocks/storm-2127 2016-04-21 22:48:32 +03:00
Oz Linden 4322f4b21f Merged in Ansariel/391-blizzard-496-merge-cleanup (pull request #29)
Fix further merge error in LLLiveLSLEditor::draw()
2016-04-21 15:46:27 -04:00
Oz Linden 922783ef66 Merged ruslantproductengine/ruslanteliuk-391-blizzard/tip into default 2016-04-21 15:14:19 -04:00
ruslantproductengine 7f077a5e3a MAINT-6326 [QuickGraphics-RC] Blingposter avatars are all full bright white when basic shaders are disabled. 2016-04-21 22:09:40 +03:00
Rider Linden 6ad159c052 MAINT-6336: Merge 2016-04-21 11:54:33 -07:00
Oz Linden 185aeb2dcc Merged in ruslantproductengine/ruslanteliuk-391-blizzard (pull request #30)
MAINT-6317 [QuickGraphics-RC] Some rigged mesh attachments render fully on jellybaby avatars when ALM is enabled
2016-04-21 14:47:09 -04:00
Oz Linden 56ca483905 correct llphysicsextensions package for windows 2016-04-21 12:56:23 -04:00
Rider Linden 8f4be8bb86 MAINT-6336: Removed or demoted some of the chatty log messages I was using to track progress. 2016-04-21 09:16:50 -07:00
ruslantproductengine 503dc6ee65 MAINT-6317 [QuickGraphics-RC] Some rigged mesh attachments render fully on jellybaby avatars when ALM is enabled
FIXED
- remove global identifier for the black texture
- add black texture 2x2x3 localy on apllication startup
- add special flag to LLViewerFetchedTexture for protect from removing
2016-04-21 12:47:49 +03:00
Cinder Biscuits a07897bf9c contributions.txt edited online with Bitbucket 2016-04-21 01:27:52 +00:00
Cinder c2c0c537bb STORM-2127 - Fix NSException when assigning values that don't exist in cocoa modifier key event. 2016-04-20 16:13:17 -06:00