Commit Graph

200 Commits (ee37ea4aa751de128ce51f59260716d8ee8ee6ed)

Author SHA1 Message Date
Brad Payne (Vir Linden) ef311198f9 SL-18119 - log group join, object add or rez 2022-09-22 15:48:28 +01:00
Mnikolenko Productengine 8112cefa73 SL-16026 FIXED Copying only one diffuse texture allows pasting this texture into other types of textures 2022-04-26 19:07:39 +03:00
Dave Houlton 2a6b48c9b0 DRTVWR-440, merge in latest from 6.3.7 release 2020-01-28 17:26:45 -07:00
andreykproductengine f7ad4bdd19 SL-209 Cleanup Merchant Outbox 2019-08-15 19:53:34 +03:00
Rider Linden 1d022e86c8 Merge 2018-11-14 11:19:33 -08:00
Rider Linden 56c773b3bc Merge 2018-08-03 16:19:47 -07:00
Brad Payne (Vir Linden) 6ce09ad712 merge 2018-08-02 21:54:09 +01:00
Rider Linden 442bbfed34 Adding settings DAD type 2018-06-20 12:37:17 -07:00
maxim_productengine 5aee1efc0e MAINT-8706 Require holding Control key to drag folders into in world objects 2018-06-05 15:27:22 +03:00
Brad Payne (Vir Linden) 7a006ea3a2 merge 2018-05-18 18:40:36 +01:00
andreykproductengine 71e8aebc73 MAINT-6260 Fixed Rezing from trash causes dupes after restart 2018-02-20 18:31:26 +02:00
Brad Payne (Vir Linden) b0e47ec2c2 SL-713, MAINT-7709 - experimental setting to allow left-click interaction with animesh. Disabled by default. Still doesn't work in all cases and has significant performance impact 2017-12-19 13:33:54 +00:00
andreykproductengine 341ecb2324 MAINT-7483 Fixed inability to drag a folder into object contents 2017-06-15 16:45:57 +03:00
andreykproductengine 605160d501 MAINT-7118 Swapping legacy people API with new cache 2017-02-15 20:40:03 +02:00
AndreyL ProductEngine 445cd96293 Merged in lindenlab/viewer-release 2016-05-20 00:03:30 +03:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Aura Linden 104b117154 Faster to copy changes than merge branches. 2016-03-31 15:26:53 -07:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Rider Linden e7eaa94dfa Merge VR 2016-01-15 13:36:38 -08:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Rider Linden 53b947e039 Merge from viewer release. 2015-10-19 12:03:08 -07:00
Rider Linden bb8afb10d5 MAINT-5282: I've removed most of the depricated Merchant Outbox code and the links to it in the menus. Also removed the Outbox Floater and made the folder always hidden if empty in inventory.
(There may still be some outstanding Outbox code that was not obvious that I have missed.)
2015-09-24 16:16:24 -07:00
AndreyL ProductEngine 67757ddd5b MAINT-5416 FIXED Cannot right-click a rigged mesh that's worn
--HG--
branch : maint-5416
2015-09-04 21:06:22 +03:00
andreykproductengine 6e2e83a608 MAINT-5547 FIXED errors when texturing a linkset "Unable to add texture. Please wait a few seconds and try again." 2015-08-25 17:34:56 +03:00
andreykproductengine f94a19e09e Merge downstream code and become version 3.8.3 2015-08-04 16:45:49 +03:00
AndreyL ProductEngine b5378f93b2 Merge viewer-release and become version 3.8.3 2015-08-04 05:00:59 +03:00
AndreyL ProductEngine 57904b4def MAINT-5416 Reverted changeset: 9bd24c17d908 2015-07-23 23:59:05 +03:00
AndreyL ProductEngine 269cc894a9 MAINT-5416 FIXED cannot right-click a rigged mesh that's worn 2015-07-17 07:31:36 +03:00
andreykproductengine d9341caf45 MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected 2015-07-17 17:36:33 +03:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
Merov Linden d631f2fd4d Pull merge from lindenlab/viewer-tools-update (includes viewer-release) 2015-04-14 13:46:01 -07:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Merov Linden 9ba10bf1f2 Merge lindenlab/viewer-tools-update 2015-03-16 09:49:57 -07:00
andreykproductengine 5220b0903c MAINT-4897 FIXED Frequent error when texturing a linkset - "Unable to add texture. Please wait a few seconds and try again." 2015-03-03 17:41:34 +02:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
Mnikolenko ProductEngine fd83804a1c MAINT-4799 FIXED Show complete avatar names in confirmation dialog. 2015-01-16 11:55:36 +02:00
Merov Linden b0f590f6ab Pull merge from lindenlab/viewer-release 2014-12-19 06:00:48 -08:00
callum_linden c7fb834c9d Update to build on Xcode 6.0: cast doesn't change overloading rules - poorly commented 2014-10-20 11:08:54 -07:00
Merov Linden 4b80a5ed05 Pull merge from lindenlab/viewer-release 2014-09-28 21:40:32 -07:00
andreykproductengine c9d24fefc0 MAINT-4086 FIXED Limit the number items "Replace Current Outfit" or "Wear" applies to
Nested folders fix
2014-08-11 15:36:42 +03:00
Merov Linden 87a7eee21d Sync merge with lindenlab/viewer-release 2014-07-22 15:54:53 -07:00
andreykproductengine 6b40206279 MAINT-4086 FIXED Limit the number items "Replace Current Outfit" or "Wear" applies to 2014-07-01 18:33:23 +03:00
Merov Linden 68b62747ed Pull merge from lindenlab/viewer-release 2014-05-30 14:19:53 -07:00
Merov Linden 8193caa793 DD-88 : Make Drag and Drop tooltips for Merchant Outbox and Marketplace restrictions identical 2014-05-20 21:40:48 -07:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
andreykproductengine f4ef763eec MAINT-2726 FIXED confirm before sharing items flag not working if sharing a folder
merged InventoryCategory processing with other objects.
Removed one of explicit GiveAcceptable checks (there were three, one per step).
2014-03-12 20:01:53 +02:00
MaximB ProductEngine 72d2d1a975 MAINT-3519 (Resident is able to share worn clothes.) 2013-12-12 09:38:02 +02:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00