Commit Graph

906 Commits (533b3540cc8cd3d48d2e3d5cfd760bc09e21fdd3)

Author SHA1 Message Date
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
Ansariel 932dc479f2 FIRE-24334: Remove restriction on adding system layers with identical asset UUIDs at the same time since at some point LL fixed it server-side and creating a new asset UUID 2019-09-02 20:43:57 +02:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Tonya Souther fd0f8a1cf5 OS X compile fixes. 2019-04-20 19:31:01 -05:00
AndreyL ProductEngine e31f4a352d Mac buildfix 2019-05-14 01:14:54 +03:00
Ansariel 5560f13b4b Merge axon 2018-06-07 19:15:42 +02:00
Ansariel d799bec7d8 Merge Firestorm LGPL 2018-05-18 14:46:58 +02:00
Brad Payne (Vir Linden) 7a006ea3a2 merge 2018-05-18 18:40:36 +01:00
Ansariel 9948fe9cc6 Merge Firestorm LGPL 2018-03-02 11:01:50 +01:00
Ansariel 7e68f66827 Merge Firestorm LGPL 2018-02-27 18:13:33 +01:00
Ansariel 6ff47d4741 Add some additional logging 2018-02-19 21:32:20 +01:00
Ansariel 999163b3f5 Merge viewer-neko 2018-02-12 21:45:05 +01:00
Andrey Kleshchev 3b9da6dc2f MAINT-8004 Make replace work regardless of current attachments 2018-02-06 17:36:51 +00:00
Ansariel 13ea9a242a Merge Firestorm LGPL 2017-10-11 20:30:12 +02:00
Brad Payne (Vir Linden) 299592e88e merge 2017-10-11 14:16:39 +01:00
Ansariel 01d8e7e347 Merge axon 2017-09-20 01:09:14 +02:00
Ansariel 615336a4d4 Merge viewer-neko 2017-09-07 21:49:12 +02:00
Mnikolenko Productengine ba92c6150a MAINT-7745 FIXED After editing an outfit, duplicate photos appear in the Outfit Gallery for outfits that previously had no photo. 2017-09-04 16:51:22 +03:00
Ansariel 7c97b96d5d Merge viewer-neko 2017-08-30 20:00:53 +02:00
Ansariel b574628da2 Merge Firestorm LGPL 2017-08-30 19:15:42 +02:00
andreykproductengine 13328aa403 MAINT-7665 Remove menu option should delete both links and images 2017-08-23 21:20:45 +03:00
Ansariel 0d9b019b42 Merge viewer-neko 2017-08-23 09:34:24 +02:00
andreykproductengine 04618144ff MAINT-7665 Remove menu option should delete both links and images 2017-08-23 21:20:45 +03:00
andreykproductengine b7894fce4f MAINT-7665 Outfit folders should be capable of accepting images for preview 2017-08-14 20:04:06 +03:00
Brad Payne (Vir Linden) 72010fba4d SL-718 - bug fixes for animated objects as attachments: Pause all associated avatars when selecting/editing. Don't apply joint positions to the attached avatar on login. 2017-08-04 16:20:04 +01:00
Mnikolenko Productengine 10028b15f6 MAINT-7745 FIXED After editing an outfit, duplicate photos appear in the Outfit Gallery for outfits that previously had no photo. 2017-09-04 16:51:22 +03:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
andreykproductengine 306cec78aa MAINT-7249 Fixing obsolete suffix for wearables that are no longer worn 2017-04-05 19:34:04 +03:00
Ansariel 80f2d2f827 Merge LL Viewer release 5.0.2 2017-03-06 21:35:23 +01:00
andreykproductengine 535f5c5120 MAINT-7161 Crash in LLViewerInventoryItem 2017-03-01 19:26:26 +02:00
Ansariel 366b684300 Merge viewer-bear 2017-02-03 20:14:11 +01:00
andreykproductengine fd81f83f6b MAINT-2438 Fixes wrong permissions source 2017-02-03 20:14:42 +02:00
Ansariel dd69a22834 Merge viewer-bear 2017-01-27 09:42:51 +01:00
andreykproductengine c4476c78f1 MAINT-2438 When wearing 2 pair of identical pants, only one pair was editable 2017-01-04 10:51:52 +02:00
Ansariel 8c083cf771 Merge Firestorm LGPL 2016-12-05 22:40:59 +01:00
Ansariel e2b86ee754 Merge viewer-lynx 2016-12-05 21:56:45 +01:00
AndreyL ProductEngine 2abd0eef41 Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
Ansariel 16acd2d20a Merge Firestorm LGPL 2016-12-04 14:05:44 +01:00
Ansariel 1f1ea62a40 Merge Firestorm LGPL 2016-12-04 12:44:37 +01:00
Kitty Barnett 4503a28aee Merged with RLVa fixes 2016-12-03 17:13:17 +01:00
andreykproductengine bd411d4503 MAINT-6562 Avatar COF was occasionally failing to update because Not Found 2016-12-01 13:58:24 +02:00
Ansariel 5a58635b64 Merge Firestorm LGPL 2016-11-16 16:11:56 +01:00
Brad Payne (Vir Linden) d31596db6a merge 2016-11-16 08:39:41 -05:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
Ansariel 1824cb9d82 Merge Firestorm LGPL 2016-11-15 12:17:59 +01:00
AndreyL ProductEngine 7fceb3a63f Merged in lindenlab/viewer-cleanup 2016-11-14 22:04:37 +02:00
Kitty Barnett 4e99177b14 Merged with Appearance-Misc tip
--HG--
branch : RLVa
2016-11-14 20:15:31 +01:00
Kitty Barnett bac1de6c68 Reviewed Appearance-SyncAttach for Catznip-R11
-> none of the work on AIS fixes the original problem from 6 years ago (see VWR-18512 and previous changesets in Appearance-Misc patch branch)
  -> Repro:
       * folder with 1 attachment and 2 wearables
       * double-click (in rapid succession) wearable 1, then attachment A and finally wearable 2
       => after double-clicking wearable 2 the attachment will end up detached

--HG--
branch : Appearance-Misc
2016-11-14 20:12:11 +01:00
Ansariel 3fed6c743a Merge Firestorm LGPL 2016-11-11 16:04:29 +01:00
Ansariel e9b067d7db FIRE-16794: Selecting and wearing multiple bodyparts only wears one of them 2016-11-07 14:14:45 +01:00