Commit Graph

564 Commits (b0274e1bdd2b140d3c699d096deceefe73e71ec2)

Author SHA1 Message Date
Andrey Lihatskiy b6441bf09b Merge branch 'DRTVWR-500' into DRTVWR-501-maint 2020-04-29 19:34:39 +03:00
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500
# Conflicts:
#	indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
Andrey Lihatskiy a520c01c73 Merge branch 'master' into DRTVWR-501-maint 2020-03-28 01:00:34 +02:00
Dave Houlton 331f290f61 Merge master (v 6.3.9) into DRTVWR-440 2020-03-18 15:39:38 -06:00
Andrey Lihatskiy 6662f7348b Merge branch 'master' into DRTVWR-500 2020-03-18 20:52:51 +02:00
Brad Payne (Vir Linden) 4300b204f0 SL-10499 - handle package info from benefits service 2019-11-20 14:03:57 +00:00
Brad Payne (Vir Linden) 65550520ed SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits. 2019-11-15 15:13:11 +00:00
andreykproductengine 88100d8f62 SL-12169 Crash on setToolBarsVisible() during exit 2019-10-22 19:05:29 +03:00
Brad Payne (Vir Linden) c7747d2a1b merge 2019-10-16 22:24:03 +01:00
andreykproductengine 08969001e2 SL-6109 Mouse support ready 2019-09-25 17:54:36 +03:00
Graham Linden 3609eabe54 Merge viewer-release 6.3.2 2019-09-10 12:07:01 -07:00
AndreyL ProductEngine 05f1e3e713 Merged in lindenlab/viewer-lynx 2019-09-05 21:53:24 +03:00
Graham Linden 723f1891db Merge 6.3.1 viewer-release 2019-08-26 12:35:18 -07:00
AndreyL ProductEngine 1aedd96cd1 Merged in lindenlab/viewer-release 2019-08-26 22:21:30 +03:00
Brad Payne (Vir Linden) 7d309ed5d7 no-op change to force build and build number update 2019-07-24 21:30:28 +01:00
andreykproductengine d72fcfba57 SL-11402 Resaving home image if file does not exist 2019-06-13 19:00:20 +03:00
Graham Linden a12fbc84d3 Fix crashes on exit from trying to lock log mutices while doing CRT abandon ship ritual. 2019-06-04 10:58:56 -07:00
Rider Linden 1d022e86c8 Merge 2018-11-14 11:19:33 -08:00
Brad Payne (Vir Linden) a84ee929a5 merge 2018-09-27 19:54:10 +01:00
Rider Linden 78866b33a9 Merge 2018-09-26 13:46:45 -07:00
Brad Payne (Vir Linden) c5a2aa0028 SL-9671 - refresh simulator features on region change 2018-09-17 20:34:43 +01:00
andreykproductengine b2b075a235 MAINT-6291 Fixed Scripted teleports have a higher rate of failure than user-initiated teleports.
Sim apparently sends finish and start messages simultaneously in case of
scripted or experience teleports
2018-08-29 20:30:07 +03:00
maxim_productengine fdbcb3fa76 SL-10687 FIXED Audio error when trying to fly when flying is not available 2019-03-06 17:26:51 +02:00
Rider Linden f07dc421e8 Merge 2018-06-21 09:13:19 -07:00
Rider Linden fa4ac065cb Enable sky changes with altitude. 2018-05-24 13:11:33 -07:00
Rider Linden 3888de9439 Merge 2018-05-22 13:16:37 -07:00
maxim_productengine 4c37033157 MAINT-8316 FIXED Crash in LLAgent::teleportRequest(..) 2018-02-21 18:03:08 +02:00
Rider Linden 1df10afa2a Merge 2017-11-30 11:42:49 -08:00
Rider Linden b37eb2642f Remove delete preset dialog, Initial settings for selection level (Region/Parcel/Local) 2017-11-10 16:17:25 -08:00
Rider Linden dde727aa0f MAINT-7254, MAINT-7255: Use cap to get and set UserInfo on simhost. Check new is_verified flag and disable IM2Email if value is false. 2017-06-06 10:21:34 -07:00
Rider Linden 746848bee9 MAINT-7255: Change viewer to use UserInfo cap if available. 2017-04-06 14:46:48 -07:00
andreykproductengine b4c6510d05 MAINT-7162 Forced sit on a physical object triggers a bogus "Cancelled Sit" message 2017-04-03 20:25:51 +03:00
Mnikolenko Productengine 078f5d3c2a MAINT-275 Allow showing Beacons floater in mouse look 2017-01-17 14:47:00 +02:00
AndreyL ProductEngine 2abd0eef41 Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
AndreyL ProductEngine 84c546182c Backed out changeset: ffffbe002ff2
Finally reverting the MAINT-4488 (see BUG-37693 for details)
2016-12-05 19:21:11 +02:00
Brad Payne (Vir Linden) d31596db6a merge 2016-11-16 08:39:41 -05:00
andreykproductengine 881fe0a117 Restored MAINT-4488 (perviosly reverted in MAINT-6242) 2016-10-18 01:29:27 +03:00
andreykproductengine f69e82b584 Backed out changeset: 6d631b9d02a0 for maint-6242 2016-08-22 20:57:22 +03:00
Rider Linden 0a9f25bcfb MAINT-6385: Ensure that VMM initialization only happens once after login and that it will only happen after the region caps have been received. 2016-06-22 13:35:13 -07:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Brad Payne (Vir Linden) caf4f49437 merge 2016-04-01 08:35:38 -04:00
Brad Payne (Vir Linden) 2afde26d93 merge 2016-03-21 11:00:22 -04:00
Rider Linden b8c1976460 Merge 2016-03-17 13:14:21 -07:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
Ansariel 27fd7fdee6 More elegant solution to keep fix for MAINT-2879 2016-03-09 12:21:34 +01:00
Brad Payne (Vir Linden) 88cb6814f0 SL-315 WIP - more call stack tracing, initial hooks for avatar reset skeleton option. 2016-03-07 11:24:48 -05:00
Oz Linden aa4d2891cd move script permission bits to keep fix for MAINT-2879 2016-02-07 14:43:51 -08:00
Oz Linden 867ef882fd merge changes for OPEN-292 2016-02-07 13:41:41 -08:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00